diff options
| author | Alex Johnston <acjohnston@google.com> | 2020-05-21 10:08:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-21 10:08:51 +0000 |
| commit | fa6cf17648582959be9e1311244f88a3168be72c (patch) | |
| tree | e59e04d6a2b84f46b38ca648edfa79c8bcd8b5f4 /services/devicepolicy | |
| parent | 6fd144dd1bd09e7e63dea0c7427100ab9233f6d5 (diff) | |
| parent | 67623cf5566014310b19b7a08561276ee4ab3c6a (diff) | |
Merge "setAutoTimeRequired disabled on managed profile" into rvc-dev
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 18c25c142113..c1735ffcdbb7 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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) { |