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

Commit 6fa73c8e authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Move isAdminTestOnlyLocked inside synchronized block"

parents 9c689939 faa50315

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

+4 −4
Original line number Diff line number Diff line
@@ -10431,12 +10431,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        Preconditions.checkCallAuthorization(!isManagedProfile(caller.getUserId()),

                "User %d is not allowed to call setSecondaryLockscreenEnabled",

                        caller.getUserId());













        synchronized (getLockObject()) {















            // Allow testOnly admins to bypass supervision config requirement.















            Preconditions.checkCallAuthorization(isAdminTestOnlyLocked(who, caller.getUserId())















                    || isDefaultSupervisor(caller), "Admin %s is not the "















                    + "default supervision component", caller.getComponentName());

























        synchronized (getLockObject()) {















            DevicePolicyData policy = getUserData(caller.getUserId());















            policy.mSecondaryLockscreenEnabled = enabled;















            saveSettingsLocked(caller.getUserId());