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

2023-05-24 05:43:48 +00:00
parent 649419060e dfd9ad4fd3
commit c3b7d1b23a
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/service/voice/VoiceInteractionService.java
+++ b/core/java/android/service/voice/VoiceInteractionService.java
@@ -1066,7 +1066,9 @@ public class VoiceInteractionService extends Service {
        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();
                    }