From 2a1bf58ebb336a16988a69322883575adc20e731 Mon Sep 17 00:00:00 2001
From: Eugene Susla <eugenesusla@google.com>
Date: Thu, 18 Jun 2020 13:37:14 -0700
Subject: [PATCH] Fix NPE when exempting CDM apps from  auto revoke

Test: presubmit
Fixes: 159233540
Change-Id: I6f4aa5dc92d5adb00662f091863e0d26f5a4eb66
---
 .../server/companion/CompanionDeviceManagerService.java        | 3 +++
 1 file changed, 3 insertions(+)

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