Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 443d28b6 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android Git Automerger
Browse files

am 2809d68d: am 4bb6ae67: Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-dev 

* commit '2809d68d0e709a7f4184d30ca707ad5e65e1be6f':
  Fixing a NullPointerException in isProfileOwnerApp.
parents f3872b25 f288907d

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

+4 −3
Original line number Diff line number Diff line
@@ -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");

            }