diff options
| author | Antonio Kantek <kanant@google.com> | 2020-12-04 17:22:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 17:22:40 +0000 |
| commit | 3a1c2bded9b556b144a9e0805bdb8751669a2290 (patch) | |
| tree | 754d1e4ff75d0b0570ea952d4c80055cd9da4fbb /services/companion | |
| parent | 3189599a8d2636f955ea443017fc04807ac51854 (diff) | |
| parent | 96e2d98c5c526af01d19612a7bfd84d8fa6a1cc0 (diff) | |
[DO NOT MERGE] Fixes CompanionDeviceManagerTest am: 96e2d98c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13163630
Change-Id: Id52fefe163964562351d1dac879f97f75c5b6c4d
Diffstat (limited to 'services/companion')
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 34d46bc868ae..ad91924c1e63 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -565,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) { |