Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b22ef45 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

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

Merge "Add null checking when deleting hotword detectors" into udc-dev am: c3b7d1b2 am: 07045e3f

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



Change-Id: I594c3a2a7f294949d8662a22b27613671744b483
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c6cf3b4 07045e3f

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

+3 −1
Original line number Diff line number Diff line
@@ -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();

                    }