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

Merge "Ensure ST does not remain requested after error" into udc-dev

Browse Source
This commit is contained in:
Atneya Nair
2023-05-11 15:57:00 +00:00
committed by Android (Google) Code Review
parent 3b92806912 ef2c62e79c
commit 187b8ecf0f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
View File

@@ -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;