commit 9fcff5aadd48206235d205c30cbdae47fc586e3b
author Jason Monk <jmonk@google.com> Fri May 16 14:56:17 2014 -0400
committer Jason Monk <jmonk@google.com> Fri May 16 14:56:57 2014 -0400
tree 0b14696c618bf900a5be6e1c082ae4b33b0325fd
parent 9d08a93b2dd378cdb66c35a1230d19f894481eab

Fix NPE in DevicePolicyManagerService

Bug: 15015897
Change-Id: Id9f6ae8b5abf96d35f799b150210813fb52da54c

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index a0c59cc..edbbc9f 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1214,18 +1214,20 @@
         }
         mAppOpsService = IAppOpsService.Stub.asInterface(
                 ServiceManager.getService(Context.APP_OPS_SERVICE));
-        if (mDeviceOwner.hasDeviceOwner()) {
-            try {
-                mAppOpsService.setDeviceOwner(mDeviceOwner.getDeviceOwnerPackageName());
-            } catch (RemoteException e) {
-                Log.w(LOG_TAG, "Unable to notify AppOpsService of DeviceOwner", e);
+        if (mDeviceOwner != null) {
+            if (mDeviceOwner.hasDeviceOwner()) {
+                try {
+                    mAppOpsService.setDeviceOwner(mDeviceOwner.getDeviceOwnerPackageName());
+                } catch (RemoteException e) {
+                    Log.w(LOG_TAG, "Unable to notify AppOpsService of DeviceOwner", e);
+                }
             }
-        }
-        for (Integer i : mDeviceOwner.getProfileOwnerKeys()) {
-            try {
-                mAppOpsService.setProfileOwner(mDeviceOwner.getProfileOwnerName(i), i);
-            } catch (RemoteException e) {
-                Log.w(LOG_TAG, "Unable to notify AppOpsService of ProfileOwner", e);
+            for (Integer i : mDeviceOwner.getProfileOwnerKeys()) {
+                try {
+                    mAppOpsService.setProfileOwner(mDeviceOwner.getProfileOwnerName(i), i);
+                } catch (RemoteException e) {
+                    Log.w(LOG_TAG, "Unable to notify AppOpsService of ProfileOwner", e);
+                }
             }
         }
     }