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

Commit 07045e3f 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: c3b7d1b2 

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



Change-Id: I25bda0fed3a32e78fd3c790721e390ce97f6aaa2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29fb2d0f c3b7d1b2

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();

                    }