diff options
| author | Jim Miller <jaggies@google.com> | 2014-08-22 17:04:57 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2014-08-22 18:10:08 -0700 |
| commit | 76b9b8b0ca537bad6c4da388d77a9e5dee023856 (patch) | |
| tree | 8042799996a3eaae9039237813d2132725913b63 /core/java/android/app/admin | |
| parent | c7639333f8c42efad80ad9304544c7a892b7d81f (diff) | |
| download | frameworks_base-76b9b8b0ca537bad6c4da388d77a9e5dee023856.zip frameworks_base-76b9b8b0ca537bad6c4da388d77a9e5dee023856.tar.gz frameworks_base-76b9b8b0ca537bad6c4da388d77a9e5dee023856.tar.bz2 | |
Limit grantTrust() duration to DevicePolicy-imposed limit.
Fixes bug 17046034
Change-Id: I5c512c2d05e7e0ed81eaf0dcafacc6f62a5c5937
Diffstat (limited to 'core/java/android/app/admin')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 41bbb87..a16cd7f 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1374,7 +1374,7 @@ public class DevicePolicyManager { * @param admin The name of the admin component to check, or null to aggregate * all admins. * @return time in milliseconds for the given admin or the minimum value (strictest) of - * all admins if admin is null. + * all admins if admin is null. Returns 0 if there are no restrictions. */ public long getMaximumTimeToLock(ComponentName admin) { return getMaximumTimeToLock(admin, UserHandle.myUserId()); |