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

Merge "Hotword: Propagate the DSP DetectedResult." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-09 22:32:37 +00:00
committed by Android (Google) Code Review
parent e0970984c8 603ea83bd7
commit dfbde545f3
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/service/voice/AlwaysOnHotwordDetector.java
View File

@@ -354,6 +354,13 @@ public class AlwaysOnHotwordDetector extends AbstractHotwordDetector {
null); null);
} }
EventPayload(boolean triggerAvailable, boolean captureAvailable,
AudioFormat audioFormat, int captureSession, byte[] data,
HotwordDetectedResult hotwordDetectedResult) {
this(triggerAvailable, captureAvailable, audioFormat, captureSession, data,
hotwordDetectedResult, null);
}
EventPayload(AudioFormat audioFormat, HotwordDetectedResult hotwordDetectedResult) { EventPayload(AudioFormat audioFormat, HotwordDetectedResult hotwordDetectedResult) {
this(false, false, audioFormat, -1, null, hotwordDetectedResult, null); this(false, false, audioFormat, -1, null, hotwordDetectedResult, null);
} }
@@ -1149,7 +1156,8 @@ public class AlwaysOnHotwordDetector extends AbstractHotwordDetector {
} }
@Override @Override
public void onKeyphraseDetected(KeyphraseRecognitionEvent event) { public void onKeyphraseDetected(
KeyphraseRecognitionEvent event, HotwordDetectedResult result) {
if (DBG) { if (DBG) {
Slog.d(TAG, "onDetected(" + event + ")"); Slog.d(TAG, "onDetected(" + event + ")");
} else { } else {
@@ -1157,7 +1165,7 @@ public class AlwaysOnHotwordDetector extends AbstractHotwordDetector {
} }
Message.obtain(mHandler, MSG_HOTWORD_DETECTED, Message.obtain(mHandler, MSG_HOTWORD_DETECTED,
new EventPayload(event.triggerInData, event.captureAvailable, new EventPayload(event.triggerInData, event.captureAvailable,
event.captureFormat, event.captureSession, event.data)) event.captureFormat, event.captureSession, event.data, result))
.sendToTarget(); .sendToTarget();
} }
@Override @Override

5
core/java/android/service/voice/SoftwareHotwordDetector.java
View File

@@ -147,8 +147,9 @@ class SoftwareHotwordDetector extends AbstractHotwordDetector {
} }
@Override @Override
public void onKeyphraseDetected(SoundTrigger.KeyphraseRecognitionEvent recognitionEvent) public void onKeyphraseDetected(
throws RemoteException { SoundTrigger.KeyphraseRecognitionEvent recognitionEvent,
HotwordDetectedResult result) {
} }

6
core/java/com/android/internal/app/IHotwordRecognitionStatusCallback.aidl
View File

@@ -17,6 +17,7 @@
package com.android.internal.app; package com.android.internal.app;
import android.hardware.soundtrigger.SoundTrigger; import android.hardware.soundtrigger.SoundTrigger;
import android.service.voice.HotwordDetectedResult;
import android.service.voice.HotwordRejectedResult; import android.service.voice.HotwordRejectedResult;
/** /**
@@ -29,8 +30,11 @@ oneway interface IHotwordRecognitionStatusCallback {
* @param recognitionEvent Object containing data relating to the * @param recognitionEvent Object containing data relating to the
* keyphrase recognition event such as keyphrase * keyphrase recognition event such as keyphrase
* extras. * extras.
* @param result Successful detection result payload.
*/ */
void onKeyphraseDetected(in SoundTrigger.KeyphraseRecognitionEvent recognitionEvent); void onKeyphraseDetected(
in SoundTrigger.KeyphraseRecognitionEvent recognitionEvent,
in HotwordDetectedResult result);
/** /**
* Called when a generic sound trigger event is witnessed. * Called when a generic sound trigger event is witnessed.

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

@@ -329,7 +329,7 @@ final class HotwordDetectionConnection {
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, "onDetected"); Slog.d(TAG, "onDetected");
} }
externalCallback.onKeyphraseDetected(recognitionEvent); externalCallback.onKeyphraseDetected(recognitionEvent, result);
} }
@Override @Override
@@ -362,8 +362,7 @@ final class HotwordDetectionConnection {
if (DEBUG) { if (DEBUG) {
Slog.d(TAG, "onDetected"); Slog.d(TAG, "onDetected");
} }
// TODO: Propagate the HotwordDetectedResult. externalCallback.onKeyphraseDetected(recognitionEvent, result);
externalCallback.onKeyphraseDetected(recognitionEvent);
} }
@Override @Override
@@ -407,7 +406,7 @@ final class HotwordDetectionConnection {
mHotwordDetectionConnection.detectFromDspSource( mHotwordDetectionConnection.detectFromDspSource(
recognitionEvent, mExternalCallback); recognitionEvent, mExternalCallback);
} else { } else {
mExternalCallback.onKeyphraseDetected(recognitionEvent); mExternalCallback.onKeyphraseDetected(recognitionEvent, null);
} }
} }