Merge "Fix NPE in CompanionDeviceManagerService#unlockUser()" into qt-dev am: 328cd4c86a

am: a1a859c095

Change-Id: Ied5e2e6232d7c5da4350f455c251c811b90f407a

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);