commit ed81a6aac97019b4683e34f0ee28d4770681709e
author Ahaan Ugale <augale@google.com> Sat Aug 07 03:43:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Aug 07 03:43:31 2021 +0000
tree 7876f352dc47f16450010e22ae0670ae0cfb440e
parent 6448387dc5effa537026f4b720cf58282c8dc606
parent aa0b719c40c689296193380f95caf2f3d17ab8ab

Merge "Shutdown hotword detection service when software hotword detector is shutdown" into sc-dev am: 870c4116c1 am: aa0b719c40

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15461817

Change-Id: I2d5ee271b6f24884baaf0db774a598340d787b38

core/java/android/service/voice/VoiceInteractionService.java

diff --git a/core/java/android/service/voice/VoiceInteractionService.java b/core/java/android/service/voice/VoiceInteractionService.java
index 6a0fec7..f52c9ff 100644
--- a/core/java/android/service/voice/VoiceInteractionService.java
+++ b/core/java/android/service/voice/VoiceInteractionService.java
@@ -520,6 +520,12 @@
             // Ignore.
         }
 
+        try {
+            mSystemService.shutdownHotwordDetectionService();
+        } catch (Exception ex) {
+            // Ignore.
+        }
+
         mSoftwareHotwordDetector = null;
     }