diff options
| author | Pavel Grafov <pgrafov@google.com> | 2020-03-17 11:24:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-17 11:24:48 +0000 |
| commit | 6e4ef9b5eb5e15d4f5548fb614aa102590a95c69 (patch) | |
| tree | 8cee54898d2be54b9bef4aac28f2c3363bf00676 /core/java/android | |
| parent | 3cfc4d0450d3da619e57d57aadf70d396f4b7fe2 (diff) | |
| parent | 1628ee0aafd70f0e1c95c746808fe701ece33dab (diff) | |
Merge "Make work profile maximum time off at least 3 days." into rvc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 32e0f7377fae..5b8ee71c8ba3 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -11995,7 +11995,8 @@ public class DevicePolicyManager { * * @param admin Which {@link DeviceAdminReceiver} this request is associated with * @param timeoutMillis Maximum time the profile is allowed to be off in milliseconds or 0 if - * not limited. + * not limited. The minimum non-zero value corresponds to 72 hours. If an admin sets a + * smaller non-zero vaulue, 72 hours will be set instead. * @throws IllegalStateException if the profile owner doesn't have an activity that handles * {@link #ACTION_CHECK_POLICY_COMPLIANCE} * @see #setPersonalAppsSuspended |