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

am: 7cdc320a6b

* commit '7cdc320a6be3ef285b8f0c7923c2a91ac618fbe3':
  Keep STH state in sync with HAL

Change-Id: Ib44343ad166bec80f9d0b85f260f641dcaa09923

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();