Merge "Make framework treat getModelState recognition events the same as regular recogntion events" (b38d92c5) · Commits · e / os / android_frameworks_base

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

+3 −6

Original line number	Diff line number	Diff line
		@@ -657,9 +657,8 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
		return;
		}

		if (event.status != SoundTrigger.RECOGNITION_STATUS_GET_STATE_RESPONSE) {
		model.setStopped();
		}

		try {
		callback.onGenericSoundTriggerDetected((GenericRecognitionEvent) event);
		} catch (DeadObjectException e) {
		@@ -802,9 +801,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
		return;
		}

		if (event.status != SoundTrigger.RECOGNITION_STATUS_GET_STATE_RESPONSE) {
		modelData.setStopped();
		}

		try {
		modelData.getCallback().onKeyphraseDetected((KeyphraseRecognitionEvent) event);