diff options
| author | Michal Karpinski <mkarpinski@google.com> | 2019-04-10 10:44:48 +0100 |
|---|---|---|
| committer | Michal Karpinski <mkarpinski@google.com> | 2019-04-10 11:02:54 +0100 |
| commit | 670b0d58f7976676a2e762903210d4be96f670d0 (patch) | |
| tree | 69a36aa7418b6e2736f42b800a0f4400244d9825 /services/companion | |
| parent | a29d4340068943bc30508727d3d81da6f971e4cd (diff) | |
Fix NPE in CompanionDeviceManagerService#unlockUser()
Test: manual
Bug: 130221860
Change-Id: I77f59d3b60fb79fc3b975449903ad28b5b7893e2
Diffstat (limited to 'services/companion')
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index a3e7d3685100..54a3ecb22687 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -166,6 +166,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind @Override public void onUnlockUser(int userHandle) { Set<Association> associations = readAllAssociations(userHandle); + if (associations == null || associations.isEmpty()) { + return; + } Set<String> companionAppPackages = new HashSet<>(); for (Association association : associations) { companionAppPackages.add(association.companionAppPackage); |