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

Commit ba064f73 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove the isBound() check for HotwordDetectionService." into... 

Merge "Remove the isBound() check for HotwordDetectionService." into sc-qpr1-dev am: 75bdd111 am: c4a0db78

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

Change-Id: Ied173b905d7cfdfb0bc19402d41bef4489eb356d
parents e34b2086 c4a0db78

services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java

+5 −7
Original line number Diff line number Diff line
@@ -272,13 +272,11 @@ final class HotwordDetectionConnection { 
        Slog.v(TAG, "cancelLocked");

        clearDebugHotwordLoggingTimeoutLocked();

        mDebugHotwordLogging = false;

        if (mRemoteHotwordDetectionService.isBound()) {

        mRemoteHotwordDetectionService.unbind();

        LocalServices.getService(PermissionManagerServiceInternal.class)

                .setHotwordDetectionServiceProvider(null);

        mIdentity = null;

        updateServiceUidForAudioPolicy(Process.INVALID_UID);

        }

        mCancellationTaskFuture.cancel(/* may interrupt */ true);

        if (mAudioFlinger != null) {

            mAudioFlinger.unlinkToDeath(mAudioServerDeathRecipient, /* flags= */ 0);