From 318f91b784e8f71b25e6de2f22d8e24412477ae2 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Wed, 6 Aug 2014 19:05:57 -0700
Subject: [PATCH] Fix NPE in device policy manager service.

Change-Id: I796359f903077eb0ef825ed926557f1a13b2e4c4
---
 .../server/devicepolicy/DevicePolicyManagerService.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 899a82185d784..7a7eaf1e9bd90 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();