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

Commit 3f8e88f0 authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Merge "Ensure ST does not remain requested after error" into udc-dev am: 187b8ecf am: 9493478b 

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



Change-Id: I491cba6cec336104d01d3e2bb8993a3f29a868b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 828730e3 9493478b

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java

+4 −0
Original line number Diff line number Diff line
@@ -1252,6 +1252,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { 
                    mEventLogger.enqueue(new SessionEvent(Type.RESUME_FAILED,

                                modelData.getModelId(), String.valueOf(status))

                            .printLog(ALOGW, TAG));

                    modelData.setRequested(false);

                    callback.onResumeFailed(status);

                } catch (RemoteException e) {

                    mEventLogger.enqueue(new SessionEvent(Type.RESUME_FAILED,
@@ -1300,6 +1301,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { 
                    mEventLogger.enqueue(new SessionEvent(Type.PAUSE_FAILED,

                                modelData.getModelId(), String.valueOf(status))

                            .printLog(ALOGW, TAG));

                    modelData.setRequested(false);

                    callback.onPauseFailed(status);

                } catch (RemoteException e) {

                    mEventLogger.enqueue(new SessionEvent(Type.PAUSE_FAILED,
@@ -1453,6 +1455,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { 
        }



        synchronized void setNotLoaded() {

            mRecognitionToken = null;

            mModelState = MODEL_NOTLOADED;

        }
@@ -1462,6 +1465,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { 


        synchronized void clearState() {

            mModelState = MODEL_NOTLOADED;

            mRecognitionToken = null;

            mRecognitionConfig = null;

            mRequested = false;

            mCallback = null;