diff --git a/core/java/android/service/voice/VoiceInteractionService.java b/core/java/android/service/voice/VoiceInteractionService.java index 4b761c1058034..ab9ae0acc01ed 100644 --- 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(); }