Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-15 05:00:38 +00:00
committed by Android (Google) Code Review
parent efdb4f8ac4 74b69a2516
commit 75bdd11137
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
View File

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