diff options
| author | Antonio Kantek <kanant@google.com> | 2020-12-03 13:36:15 -0800 |
|---|---|---|
| committer | Antonio Kantek <kanant@google.com> | 2020-12-03 16:42:43 -0800 |
| commit | 96e2d98c5c526af01d19612a7bfd84d8fa6a1cc0 (patch) | |
| tree | e5d12bd7bced4e9460fbdd7c7cc1e67abe3d68e9 | |
| parent | 8a6e53837ac471a3614dca19f18ee5b505b74c26 (diff) | |
[DO NOT MERGE] Fixes CompanionDeviceManagerTest
Context: 'getCallingUserId' always return 0, but assocation was created
and added to user under test (e.g. user 10, 11, etc).
The main issue is in CompanionDeviceManagerService#updateAssociations
when readAllAssocations is read using user 0 (the one retrieved via
getCallinguserId, and not the user under test).
Test switching user:
1. Create new user: `adb shell pm create-user "blah"`
2. Switch user: `adb shell am switch-user <id for blah>`
3. Run test again: `atest CompanionDeviceManagerTest`
Fixes: 147898029
Test: atest CompanionDeviceManagerTest
Test: tested switching user (see script above)
Change-Id: I87aa504684277e7c03d84fe6a7f011f661f63d8a
| -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) { |