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

2014-08-07 02:08:40 +00:00
parent 58956a5569 318f91b784
commit dd712a70c8
1 changed files with 4 additions and 0 deletions
--- 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();