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

Commit a263edf1 authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459 

am: f2ca8f9c

* commit 'f2ca8f9c':
  Do not get device owner admin info when device owner is null

Change-Id: I29edf9a63d29c8016ee88f9ebe93d3533c09dbed
parents c87bf0ad f2ca8f9c

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −3
Original line number Diff line number Diff line
@@ -3810,12 +3810,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            // If caller has PO (or DO) it can change the password, so see if that's the case first.

            ActiveAdmin admin = getActiveAdminWithPolicyForUidLocked(

                    null, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER, callingUid);

            final boolean preN = getTargetSdk(admin.info.getPackageName(),

            final boolean preN;

            if (admin != null) {

                preN = getTargetSdk(admin.info.getPackageName(),

                        userHandle) <= android.os.Build.VERSION_CODES.M;

            if (admin == null) {

            } else {

                // Otherwise, make sure the caller has any active admin with the right policy.

                admin = getActiveAdminForCallerLocked(null,

                        DeviceAdminInfo.USES_POLICY_RESET_PASSWORD);

                preN = getTargetSdk(admin.info.getPackageName(),

                        userHandle) <= android.os.Build.VERSION_CODES.M;



                // As of N, password resetting to empty/null is not allowed anymore.

                // TODO Should we allow DO/PO to set an empty password?