From 5bc8f0e17812883554b9fc88e2d39fd579c01133 Mon Sep 17 00:00:00 2001
From: Ytai Ben-Tsvi <ytai@google.com>
Date: Tue, 8 Dec 2020 10:47:08 -0800
Subject: [PATCH] Reset mServiceDisabled when service dies

When we don't reset the state, if the service died while it was
disabled, future attempts to load models would fail.

Fixes: 171953855
Test: Verified basic sound trigger cases as well as recovery from
      STHAL and audioserver crashes.
Change-Id: I32929123aa936cbee3101ec0ef65c52dd28b240b
---
 .../java/com/android/server/soundtrigger/SoundTriggerHelper.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
index 4bf93a26ec03f..283fae563ea34 100644
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
@@ -1038,6 +1038,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
             if (mModule != null) {
                 mModule.detach();
                 mModule = null;
+                mServiceDisabled = false;
             }
         }
     }