Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-dev

1 files changed, 4 insertions, 3 deletions

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 9310bf80ba13..8be52a275714 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2296,9 +2296,10 @@ public class DevicePolicyManager {
     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");
             }