commit 90af6d736550305a9201c57a5e055fb52c999dab
author Nicolas Prevot <nprevot@google.com> Wed Jul 30 14:19:12 2014 +0100
committer Nicolas Prevot <nprevot@google.com> Wed Jul 30 15:02:57 2014 +0100
tree 9557b5fb1c4d87d8bb1e03473d14b2463bbd5ff8
parent 22f2ee567dd1b1a42432251229bcb2f05c1c4700

Fixing a NullPointerException in isProfileOwnerApp.

Fixing a NullPointerException in isProfileOwnerApp of DevicePolicyManager
if there is no profile owner.

BUG: 16673376
Change-Id: I912fcd38343d3c1893313e6335802d26014a2e9d

core/java/android/app/admin/DevicePolicyManager.java

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 9310bf8..8be52a2 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2296,9 +2296,10 @@
     public boolean isProfileOwnerApp(String packageName) {
         if (mService != null) {
             try {
-                String profileOwnerPackage = mService.getProfileOwner(
-                        Process.myUserHandle().getIdentifier()).getPackageName();
-                return profileOwnerPackage != null && profileOwnerPackage.equals(packageName);
+                ComponentName profileOwner = mService.getProfileOwner(
+                        Process.myUserHandle().getIdentifier());
+                return profileOwner != null
+                        && profileOwner.getPackageName().equals(packageName);
             } catch (RemoteException re) {
                 Log.w(TAG, "Failed to check profile owner");
             }