Merge "Keep STH state in sync with HAL" into nyc-dev

2016-05-02 16:26:18 +00:00
parent b7d513cb47 56056038f7
commit 7cdc320a6b
1 changed files with 4 additions and 1 deletions
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
@@ -501,7 +501,10 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
                    if (status != STATUS_OK) {
                        Slog.w(TAG, "Error stopping keyphrase model: " + model.getHandle());
                    }
-                    model.clearState();
+                    model.setStopped();
+                    model.setRequested(false);
+                    model.clearCallback();
+                    model.setRecognitionConfig(null);
                }
            }
            internalClearGlobalStateLocked();