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

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

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

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

Change-Id: I06ace5568c30b982ff9e306f41133dc7a0127b58
parents bf3d429e 75bdd111

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