aa972f2c88bad12454adec3ae5af16fb64ea4fbe - platform_frameworks_base

commit	aa972f2c88bad12454adec3ae5af16fb64ea4fbe	[log] [tgz]
author	Daniel Kim <danieljkim@google.com>	Fri Aug 12 15:59:47 2022 +0000
committer	Daniel <danieljkim@google.com>	Mon Aug 15 22:45:55 2022 +0000
tree	6bdcfe651af1cd8e368ebea56f94fe889f7dc7ea
parent	b8d96cdbc416a514ebee6c8bf19be8f6991c1f44 [diff]

Revert^2 "Add proximity state to the HotwordDetectedResult"

Reverting the previous revert commit which was merged to resolve the
broken tests. Adding a fix to the broken tests by surrounding
mAttentionManagerInternal with null checks.

dbe5ad1a72efea402f35e2e3e938f0c16e1473bc

Test: atest CtsVoiceInteractionTestCases, atest CtsVoiceInteractionTestCases:android.voiceinteraction.cts.AlwaysOnHotwordDetectorTest#testAlwaysOnHotwordDetector_startRecognitionWithData -- --abi x86_64
Change-Id: Ife5fb9220518a32a89494217f56932f290cce5f3
Merged-In: Ife5fb9220518a32a89494217f56932f290cce5f3

core/java/android/service/voice/HotwordDetectedResult.java[diff]
services/core/java/com/android/server/attention/AttentionManagerService.java[diff]
services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java[diff]

3 files changed