Fix NPE in CompanionDeviceManagerService#unlockUser()

Test: manual Bug: 130221860 Change-Id: I77f59d3b60fb79fc3b975449903ad28b5b7893e2
AOSP-10-CAF · Apr 10, 2019 · 670b0d5 · 670b0d5
1 parent a29d434
commit 670b0d5
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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 void onStart() {
     @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);