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

Merge "Invalidate recognition token if model is stopped" into udc-dev

Browse Source
This commit is contained in:
Atneya Nair
2023-05-09 16:18:45 +00:00
committed by Android (Google) Code Review
parent b9683d61cb 8db839c7f6
commit 9204df3757
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerModule.java
View File

@@ -487,10 +487,11 @@ class SoundTriggerModule implements IBinder.DeathRecipient, ISoundTriggerHal.Glo
if (mRecognitionToken == null) { if (mRecognitionToken == null) {
return; return;
} }
event.token = mRecognitionToken;
if (!event.recognitionEvent.recognitionStillActive) { if (!event.recognitionEvent.recognitionStillActive) {
setState(ModelState.LOADED); setState(ModelState.LOADED);
mRecognitionToken = null;
} }
event.token = mRecognitionToken;
callback = mCallback; callback = mCallback;
} }
// The callback must be invoked outside of the lock. // The callback must be invoked outside of the lock.
@@ -512,10 +513,11 @@ class SoundTriggerModule implements IBinder.DeathRecipient, ISoundTriggerHal.Glo
if (mRecognitionToken == null) { if (mRecognitionToken == null) {
return; return;
} }
event.token = mRecognitionToken;
if (!event.phraseRecognitionEvent.common.recognitionStillActive) { if (!event.phraseRecognitionEvent.common.recognitionStillActive) {
setState(ModelState.LOADED); setState(ModelState.LOADED);
mRecognitionToken = null;
} }
event.token = mRecognitionToken;
callback = mCallback; callback = mCallback;
} }
// The callback must be invoked outside of the lock. // The callback must be invoked outside of the lock.