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

Merge "expand test API for DSP kephrase trigger" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-18 15:46:05 +00:00
committed by Android (Google) Code Review
parent bc3aaf19ba 3d1093eefb
commit ad2aa52507
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/test-current.txt
View File

@@ -2429,7 +2429,7 @@ package android.service.quicksettings {
package android.service.voice { package android.service.voice {
public class AlwaysOnHotwordDetector implements android.service.voice.HotwordDetector { public class AlwaysOnHotwordDetector implements android.service.voice.HotwordDetector {
method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public void triggerHardwareRecognitionEventForTest(int, int, boolean, int, int, int, boolean, @NonNull android.media.AudioFormat, @Nullable byte[]); method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public void triggerHardwareRecognitionEventForTest(int, int, boolean, int, int, int, boolean, @NonNull android.media.AudioFormat, @Nullable byte[], @NonNull java.util.List<android.hardware.soundtrigger.SoundTrigger.KeyphraseRecognitionExtra>);
} }
public static final class AlwaysOnHotwordDetector.EventPayload.Builder { public static final class AlwaysOnHotwordDetector.EventPayload.Builder {

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

@@ -851,7 +851,8 @@ public class AlwaysOnHotwordDetector extends AbstractHotwordDetector {
@RequiresPermission(allOf = {RECORD_AUDIO, CAPTURE_AUDIO_HOTWORD}) @RequiresPermission(allOf = {RECORD_AUDIO, CAPTURE_AUDIO_HOTWORD})
public void triggerHardwareRecognitionEventForTest(int status, int soundModelHandle, public void triggerHardwareRecognitionEventForTest(int status, int soundModelHandle,
boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs, boolean captureAvailable, int captureSession, int captureDelayMs, int capturePreambleMs,
boolean triggerInData, @NonNull AudioFormat captureFormat, @Nullable byte[] data) { boolean triggerInData, @NonNull AudioFormat captureFormat, @Nullable byte[] data,
@NonNull List<KeyphraseRecognitionExtra> keyphraseRecognitionExtras) {
Log.d(TAG, "triggerHardwareRecognitionEventForTest()"); Log.d(TAG, "triggerHardwareRecognitionEventForTest()");
synchronized (mLock) { synchronized (mLock) {
if (mAvailability == STATE_INVALID || mAvailability == STATE_ERROR) { if (mAvailability == STATE_INVALID || mAvailability == STATE_ERROR) {
@@ -862,7 +863,8 @@ public class AlwaysOnHotwordDetector extends AbstractHotwordDetector {
mModelManagementService.triggerHardwareRecognitionEventForTest( mModelManagementService.triggerHardwareRecognitionEventForTest(
new KeyphraseRecognitionEvent(status, soundModelHandle, captureAvailable, new KeyphraseRecognitionEvent(status, soundModelHandle, captureAvailable,
captureSession, captureDelayMs, capturePreambleMs, triggerInData, captureSession, captureDelayMs, capturePreambleMs, triggerInData,
captureFormat, data, null /* keyphraseExtras */), captureFormat, data, keyphraseRecognitionExtras.toArray(
new KeyphraseRecognitionExtra[0])),
mInternalCallback); mInternalCallback);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();