From 90af6d736550305a9201c57a5e055fb52c999dab Mon Sep 17 00:00:00 2001 From: Nicolas Prevot Date: Wed, 30 Jul 2014 14:19:12 +0100 Subject: 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 | 7 ++++--- 1 file 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"); } -- cgit v1.2.3-59-g8ed1b