diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index a3e7d36851001..54a3ecb226872 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 void onStart() { @Override public void onUnlockUser(int userHandle) { Set associations = readAllAssociations(userHandle); + if (associations == null || associations.isEmpty()) { + return; + } Set companionAppPackages = new HashSet<>(); for (Association association : associations) { companionAppPackages.add(association.companionAppPackage);