diff options
| author | Jim Miller <jaggies@google.com> | 2014-08-27 03:08:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-27 03:08:02 +0000 |
| commit | d22a6677312d17d23da3b655a2e9b12533dfff76 (patch) | |
| tree | 876b95718ae8a5a58bc4aabfc3b4dc42d494f7cc /core/java/android/app/admin | |
| parent | 6c79454cfc59c07af94289faceb87598aa570616 (diff) | |
| parent | 76b9b8b0ca537bad6c4da388d77a9e5dee023856 (diff) | |
| download | frameworks_base-d22a6677312d17d23da3b655a2e9b12533dfff76.zip frameworks_base-d22a6677312d17d23da3b655a2e9b12533dfff76.tar.gz frameworks_base-d22a6677312d17d23da3b655a2e9b12533dfff76.tar.bz2 | |
Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev
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 b17309f..5c24540 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()); |