diff options
| author | Michal Karpinski <mkarpinski@google.com> | 2019-04-10 07:21:30 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-10 07:21:30 -0700 |
| commit | 78290da56642ef4109543f4faaa67a13e2658cac (patch) | |
| tree | fdb33e8072a067c15b098012e5ac083d00701bef /services/companion | |
| parent | a477c04ba5b2d3ea916725f668cc244289e0908e (diff) | |
| parent | a1a859c095800207f4cb7c169f9baf833de12e8a (diff) | |
Merge "Fix NPE in CompanionDeviceManagerService#unlockUser()" into qt-dev am: 328cd4c86a
am: a1a859c095
Change-Id: Ied5e2e6232d7c5da4350f455c251c811b90f407a
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 e9c38501643e..067becbf0c52 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); |