Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b3f1ec6 authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Merge "Invalidate recognition token if model is stopped" into udc-dev am: 9204df37 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23075452



Change-Id: I175be88bd9d069050201ea79ae9854f20a4f810a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38522c38 9204df37

services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerModule.java

+4 −2
Original line number Diff line number Diff line
@@ -487,10 +487,11 @@ class SoundTriggerModule implements IBinder.DeathRecipient, ISoundTriggerHal.Glo 
                    if (mRecognitionToken == null) {

                        return;

                    }

                    event.token = mRecognitionToken;

                    if (!event.recognitionEvent.recognitionStillActive) {

                        setState(ModelState.LOADED);

                        mRecognitionToken = null;

                    }

                    event.token = mRecognitionToken;

                    callback = mCallback;

                }

                // The callback must be invoked outside of the lock.
@@ -512,10 +513,11 @@ class SoundTriggerModule implements IBinder.DeathRecipient, ISoundTriggerHal.Glo 
                    if (mRecognitionToken == null) {

                        return;

                    }

                    event.token = mRecognitionToken;

                    if (!event.phraseRecognitionEvent.common.recognitionStillActive) {

                        setState(ModelState.LOADED);

                        mRecognitionToken = null;

                    }

                    event.token = mRecognitionToken;

                    callback = mCallback;

                }

                // The callback must be invoked outside of the lock.