commit c3b7d1b23aad1dd5f72a7998af14e074590399d2
author Charles Chen <liangyuchen@google.com> Wed May 24 05:43:48 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 24 05:43:48 2023 +0000
tree 05270f7bc6ed2a175d887794017a57875a67df8d
parent 649419060e5abaa4e176bf801b6e6c662788c20d
parent dfd9ad4fd34014f9b772e150d389b9b9f9e5f4ae

Merge "Add null checking when deleting hotword detectors" into udc-dev

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 4b761c1..ab9ae0a 100644
--- a/core/java/android/service/voice/VoiceInteractionService.java
+++ b/core/java/android/service/voice/VoiceInteractionService.java
@@ -1066,7 +1066,9 @@
         synchronized (mLock) {
             mActiveDetectors.forEach(detector -> {
                 try {
-                    if (detector != mActiveVisualQueryDetector.getInitializationDelegate()
+                    // Skip destroying VisualQueryDetector if HotwordDetectors are created
+                    if (!(mActiveVisualQueryDetector != null
+                            && detector == mActiveVisualQueryDetector.getInitializationDelegate())
                             || shouldShutDownVisualQueryDetector) {
                         detector.destroy();
                     }