Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix ChangeIds population from voiceinteraction"

Browse Source
This commit is contained in:
Nicholas Ambur
2023-01-31 20:18:24 +00:00
committed by Android (Google) Code Review
parent 258a4eef90 59c08f624d
commit 8ba29a27be
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/voiceinteraction/Android.bp
View File

@@ -20,6 +20,7 @@ java_library_static {
srcs: [":services.voiceinteraction-sources"],
libs: [
"services.core",
"app-compat-annotations",
"android.hardware.power-V1-java",
"android.hardware.power-V1.0-java",
],

20
services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
View File

@@ -51,7 +51,6 @@ import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SharedMemory;
import android.provider.DeviceConfig;
import android.service.voice.HotwordDetectedResult;
import android.service.voice.HotwordDetectionService;
import android.service.voice.HotwordDetector;
import android.service.voice.IMicrophoneHotwordDetectionVoiceInteractionCallback;
@@ -89,19 +88,18 @@ final class HotwordDetectionConnection {
static final boolean DEBUG = false;
/**
* For apps targeting Android API {@link Build.VERSION_CODES#UPSIDE_DOWN_CAKE} and above,
* implementors of the {@link HotwordDetectionService} must not augment the phrase IDs which are
* supplied via {@link HotwordDetectionService
* #onDetect(AlwaysOnHotwordDetector.EventPayload, long, HotwordDetectionService.Callback)}.
* For apps targeting Android API Build.VERSION_CODES#UPSIDE_DOWN_CAKE and above,
* implementors of the HotwordDetectionService must not augment the phrase IDs which are
* supplied via HotwordDetectionService
* #onDetect(AlwaysOnHotwordDetector.EventPayload, long, HotwordDetectionService.Callback).
*
* <p>The {@link HotwordDetectedResult#getHotwordPhraseId()} must match one of the phrase IDs
* from the {@link android.service.voice.AlwaysOnHotwordDetector
* .EventPayload#getKeyphraseRecognitionExtras()} list.
* <p>The HotwordDetectedResult#getHotwordPhraseId() must match one of the phrase IDs
* from the AlwaysOnHotwordDetector.EventPayload#getKeyphraseRecognitionExtras() list.
* </p>
*
* <p>This behavior change is made to ensure the {@link HotwordDetectionService} honors what
* it receives from the {@link android.hardware.soundtrigger.SoundTriggerModule}, and it
* cannot signal to the client application a phrase which was not origially detected.
* <p>This behavior change is made to ensure the HotwordDetectionService honors what
* it receives from the android.hardware.soundtrigger.SoundTriggerModule, and it
* cannot signal to the client application a phrase which was not originally detected.
* </p>
*/
@ChangeId