commit 00c7949426fe56c4d10aeaeb59b0b103bf03fcb7
author Craig Mautner <cmautner@google.com> Thu Apr 23 19:55:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 23 19:55:03 2015 +0000
tree f5e1b1487ab8fef9f242c3c2aff175a47a7abc6d
parent b3614b7285fd0aa2ea385df42eef2d69d37e8c27
parent 1513ff171ae43d141295a235e42d99071e144cdb

Merge "Fix NPE when load() returns nulls."

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 44b3f69..20c74f1 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -1672,7 +1672,7 @@
         IActivityManager am = ActivityManagerNative.getDefault();
         long ident = Binder.clearCallingIdentity();
         try {
-            am.updateDeviceOwner(mDeviceOwner.getDeviceOwnerPackageName());
+            am.updateDeviceOwner(getDeviceOwner());
         } catch (RemoteException e) {
             // Not gonna happen.
         } finally {