diff options
| author | Jason Parks <jparks@google.com> | 2017-01-24 02:46:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-24 02:46:29 +0000 |
| commit | 7a190b08fe2b3b66e52b92155fd89fca04d2893f (patch) | |
| tree | f0c9036aaa3ae3e4fa52f2086b4d3615e78b4188 /core/java | |
| parent | 0d4d74d619972b4e3d2668e8ee9d59a031cdc45f (diff) | |
| parent | 841cb0a37f5602de1b410f558930f8e5d09e013a (diff) | |
Merge "Allow the profile owner to enforce auto time."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 0da89eb2bd98..aa56be6f36cd 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3735,13 +3735,13 @@ public class DevicePolicyManager { } /** - * Called by a device owner to set whether auto time is required. If auto time is required the - * user cannot set the date and time, but has to use network date and time. + * Called by a device or profile owner to set whether auto time is required. If auto time is + * required, no user will be able set the date and time and network date and time will be used. * <p> * Note: if auto time is required the user can still manually set the time zone. * <p> - * The calling device admin must be a device owner. If it is not, a security exception will be - * thrown. + * The calling device admin must be a device or profile owner. If it is not, a security + * exception will be thrown. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param required Whether auto time is set required or not. |
