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 am: 75bdd11137

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

Change-Id: I06ace5568c30b982ff9e306f41133dc7a0127b58
This commit is contained in:
TreeHugger Robot
2021-09-15 11:48:29 +00:00
committed by Automerger Merge Worker
parent bf3d429ed2 75bdd11137
commit 87c105f145
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

@@ -272,13 +272,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);