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

Commit a1942f5e authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "setAutoTimeRequired disabled on managed profile" into rvc-dev am: fa6cf176 

Change-Id: I501a29421dd125896dad5caa6642a6eac4c133ce
parents f1046ded fa6cf176

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

+3 −1
Original line number Diff line number Diff line
@@ -6031,10 +6031,12 @@ public class DevicePolicyManager { 
     * this API to enforce auto time will result in

     * {@link UserManager#DISALLOW_CONFIG_DATE_TIME} being set, while calling this API to lift

     * the requirement will result in {@link UserManager#DISALLOW_CONFIG_DATE_TIME} being cleared.

     * From Android 11, this API can also no longer be called on a managed profile.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param required Whether auto time is set required or not.

     * @throws SecurityException if {@code admin} is not a device owner.

     * @throws SecurityException if {@code admin} is not a device owner, not a profile owner or

     * if this API is called on a managed profile.

     * @deprecated From {@link android.os.Build.VERSION_CODES#R}. Use {@link #setAutoTimeEnabled}

     * to turn auto time on or off and use {@link UserManager#DISALLOW_CONFIG_DATE_TIME}

     * to prevent the user from changing this setting.

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

+3 −0
Original line number Diff line number Diff line
@@ -7973,6 +7973,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        final int userHandle = UserHandle.getCallingUserId();

        boolean requireAutoTimeChanged = false;

        synchronized (getLockObject()) {

            if (isManagedProfile(userHandle)) {

                throw new SecurityException("Managed profile cannot set auto time required");

            }

            ActiveAdmin admin = getActiveAdminForCallerLocked(who,

                    DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);

            if (admin.requireAutoTime != required) {