Merge "Fix NPE in device policy manager service." into lmp-dev

1 files changed, 4 insertions, 0 deletions

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 899a82185d78..7a7eaf1e9bd9 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -4584,6 +4584,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
             DevicePolicyData policy = getUserData(profileId);
             ActiveAdmin admin = policy.mAdminMap.get(ownerComponent);
 
+            if (admin == null) {
+                return Collections.emptyList();
+            }
+
             if (admin.crossProfileWidgetProviders == null
                     || admin.crossProfileWidgetProviders.isEmpty()) {
                 return Collections.emptyList();