diff options
| author | 2020-12-04 16:51:26 +0000 | |
|---|---|---|
| committer | 2020-12-04 16:51:26 +0000 | |
| commit | f05bfa9149f54acf22c2c92dc7202e14be344ebf (patch) | |
| tree | d5af093af4866ed34a77983143d32bb665cb91fb | |
| parent | 9bf2c7aaf3d964c26177be8cb6a2f70e40f81ed5 (diff) | |
| parent | 96e2d98c5c526af01d19612a7bfd84d8fa6a1cc0 (diff) | |
Merge "[DO NOT MERGE] Fixes CompanionDeviceManagerTest" into rvc-qpr-dev
| -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 bd8ce7b009ae..2110061153bc 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -563,7 +563,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) { |