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

Commit 74b69a25 authored by lpeter's avatar lpeter
Browse files

Remove the isBound() check for HotwordDetectionService. 

There will be a race condition (Ex:Create AlwaysOnHotwordDetector
twice quickly) where it will miss unbinding HotwordDetectionService
and clearing HotwordDetectionServiceProvider when using the
isBound() check for HotwordDetectionService.

Because we use "ServiceConnector.Impl" to create the connection,
it is unnecessary to use isBound() function to check if the
HotwordDetectionService should be unbound.

Bug: 195457729
Test: atest CtsVoiceInteractionTestCases
Test: atest CtsVoiceInteractionTestCases --instant
Test: manual - DSP and non-DSP
Change-Id: Ib74e0dc9364af3713007b115f7d170bf6e833810
parent ad28fe0e

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

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

        Slog.v(TAG, "cancelLocked");

        clearDebugHotwordLoggingTimeoutLocked();

        clearDebugHotwordLoggingTimeoutLocked();

        mDebugHotwordLogging = false;

        mDebugHotwordLogging = false;

        if (mRemoteHotwordDetectionService.isBound()) {

        mRemoteHotwordDetectionService.unbind();

        mRemoteHotwordDetectionService.unbind();

        LocalServices.getService(PermissionManagerServiceInternal.class)

        LocalServices.getService(PermissionManagerServiceInternal.class)

                .setHotwordDetectionServiceProvider(null);

                .setHotwordDetectionServiceProvider(null);

        mIdentity = null;

        mIdentity = null;

        updateServiceUidForAudioPolicy(Process.INVALID_UID);

        updateServiceUidForAudioPolicy(Process.INVALID_UID);

        }

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

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

        if (mAudioFlinger != null) {

        if (mAudioFlinger != null) {

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

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