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

Commit 9493478b 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 

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



Change-Id: I5a53a8fa9e942e9beb0e9d6ec1bc4c8ed6489055
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 110db142 187b8ecf

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

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

                    mEventLogger.enqueue(new SessionEvent(Type.RESUME_FAILED,

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

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

                            .printLog(ALOGW, TAG));

                            .printLog(ALOGW, TAG));

                    modelData.setRequested(false);

                    callback.onResumeFailed(status);

                    callback.onResumeFailed(status);

                } catch (RemoteException e) {

                } catch (RemoteException e) {

                    mEventLogger.enqueue(new SessionEvent(Type.RESUME_FAILED,

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

                    mEventLogger.enqueue(new SessionEvent(Type.PAUSE_FAILED,

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

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

                            .printLog(ALOGW, TAG));

                            .printLog(ALOGW, TAG));

                    modelData.setRequested(false);

                    callback.onPauseFailed(status);

                    callback.onPauseFailed(status);

                } catch (RemoteException e) {

                } catch (RemoteException e) {

                    mEventLogger.enqueue(new SessionEvent(Type.PAUSE_FAILED,

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

        }





        synchronized void setNotLoaded() {

        synchronized void setNotLoaded() {

            mRecognitionToken = null;

            mModelState = MODEL_NOTLOADED;

            mModelState = MODEL_NOTLOADED;

        }

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




        synchronized void clearState() {

        synchronized void clearState() {

            mModelState = MODEL_NOTLOADED;

            mModelState = MODEL_NOTLOADED;

            mRecognitionToken = null;

            mRecognitionConfig = null;

            mRecognitionConfig = null;

            mRequested = false;

            mRequested = false;

            mCallback = null;

            mCallback = null;