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

Merge "Fix mCachedAssociations for multiple users" into sc-dev am: 10778dd4d0

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

Change-Id: Ieba25bbfbb185e3613b69c6b238aabcbf43609cf
This commit is contained in:
Evan Chen
2021-06-16 19:25:36 +00:00
committed by Automerger Merge Worker
parent b493035a69 10778dd4d0
commit 386a890ab9
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -454,19 +454,13 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
}).cancelTimeout();
}, FgThread.getExecutor()).whenComplete(uncheckExceptions((association, err) -> {
final long callingIdentity = Binder.clearCallingIdentity();
try {
if (err == null) {
addAssociation(association);
} else {
Slog.e(LOG_TAG, "Failed to discover device(s)", err);
callback.onFailure("No devices found: " + err.getMessage());
}
cleanup();
} finally {
Binder.restoreCallingIdentity(callingIdentity);
if (err == null) {
addAssociation(association);
} else {
Slog.e(LOG_TAG, "Failed to discover device(s)", err);
callback.onFailure("No devices found: " + err.getMessage());
}
cleanup();
}));
}