diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 961dc159009ca..6859c5835c801 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -222,6 +222,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind try { Set associations = readAllAssociations(userId); + if (associations == null) { + continue; + } for (Association a : associations) { try { int uid = pm.getPackageUidAsUser(a.companionAppPackage, userId);