diff options
| author | Xin Li <delphij@google.com> | 2021-02-21 09:39:53 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-02-21 09:39:53 -0800 |
| commit | be473bf819b8570945b0d238beaaa2fa63e60c02 (patch) | |
| tree | addad6a0ab92967c35ca90cf4056940be91be73a /services/companion | |
| parent | 6cc86364fb326b3fead32008e076147e57755e98 (diff) | |
| parent | 3078660c4eb37fb00ad1e69cc695bd20f1ee7440 (diff) | |
Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851
Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
Diffstat (limited to 'services/companion')
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 66bbf66e88db..ad91924c1e63 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -300,6 +300,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind mFindDeviceCallback = callback; mRequest = request; mCallingPackage = callingPackage; + request.setCallingPackage(callingPackage); callback.asBinder().linkToDeath(CompanionDeviceManagerService.this /* recipient */, 0); final long callingIdentity = Binder.clearCallingIdentity(); @@ -308,7 +309,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind AndroidFuture<Association> future = new AndroidFuture<>(); service.startDiscovery(request, callingPackage, callback, future); return future; - }).whenComplete(uncheckExceptions((association, err) -> { + }).cancelTimeout().whenComplete(uncheckExceptions((association, err) -> { if (err == null) { addAssociation(association); } else { @@ -564,7 +565,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind if (DEBUG) { Log.i(LOG_TAG, "recordAssociation(" + association + ")"); } - updateAssociations(associations -> CollectionUtils.add(associations, association)); + updateAssociations(associations -> CollectionUtils.add(associations, association), + association.userId); } private void recordAssociation(String privilegedPackage, String deviceAddress) { |