Merge "Fix NPE when exempting CDM apps from auto revoke" into rvc-dev

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 961dc159009c..6859c5835c80 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<Association> associations = readAllAssociations(userId);
+                if (associations == null) {
+                    continue;
+                }
                 for (Association a : associations) {
                     try {
                         int uid = pm.getPackageUidAsUser(a.companionAppPackage, userId);