commit 670b0d58f7976676a2e762903210d4be96f670d0
author Michal Karpinski <mkarpinski@google.com> Wed Apr 10 10:44:48 2019 +0100
committer Michal Karpinski <mkarpinski@google.com> Wed Apr 10 11:02:54 2019 +0100
tree 69a36aa7418b6e2736f42b800a0f4400244d9825
parent a29d4340068943bc30508727d3d81da6f971e4cd

Fix NPE in CompanionDeviceManagerService#unlockUser()

Test: manual
Bug: 130221860
Change-Id: I77f59d3b60fb79fc3b975449903ad28b5b7893e2

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index a3e7d36..54a3ecb 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 @@
     @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);