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

Browse Source
This commit is contained in:
Evan Chen
2021-06-16 18:36:36 +00:00
committed by Android (Google) Code Review
parent 87dc276313 d20c7c084f
commit 10778dd4d0
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(); }).cancelTimeout();
}, FgThread.getExecutor()).whenComplete(uncheckExceptions((association, err) -> { }, FgThread.getExecutor()).whenComplete(uncheckExceptions((association, err) -> {
if (err == null) {
final long callingIdentity = Binder.clearCallingIdentity(); addAssociation(association);
try { } else {
if (err == null) { Slog.e(LOG_TAG, "Failed to discover device(s)", err);
addAssociation(association); callback.onFailure("No devices found: " + err.getMessage());
} else {
Slog.e(LOG_TAG, "Failed to discover device(s)", err);
callback.onFailure("No devices found: " + err.getMessage());
}
cleanup();
} finally {
Binder.restoreCallingIdentity(callingIdentity);
} }
cleanup();
})); }));
} }