diff options
| author | Jim Miller <jaggies@google.com> | 2014-08-14 18:02:45 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2014-08-22 22:43:30 +0000 |
| commit | d4efaac5d54cdb3735b032bb76a5639949f33216 (patch) | |
| tree | 74b853dfc837f935c60c1966e2bf2302d48c0871 /core/java/android/app/admin | |
| parent | 7653a30ea0232ab8323ec51ddcba8d8054ca8a2f (diff) | |
| download | frameworks_base-d4efaac5d54cdb3735b032bb76a5639949f33216.zip frameworks_base-d4efaac5d54cdb3735b032bb76a5639949f33216.tar.gz frameworks_base-d4efaac5d54cdb3735b032bb76a5639949f33216.tar.bz2 | |
Update TrustAgentService API after review.
Also documents timebase on related DevicePolicyManager API.
Fixes bugs 16401527 and 17046034
Change-Id: I8ee6d0055ab6f52ec71630344d3232f7875d9c1d
Diffstat (limited to 'core/java/android/app/admin')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 0dc8f66..41bbb87 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1373,6 +1373,8 @@ public class DevicePolicyManager { * and its profiles or a particular one. * @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. */ public long getMaximumTimeToLock(ComponentName admin) { return getMaximumTimeToLock(admin, UserHandle.myUserId()); |