From 6b85768058b065cc682757a366abc828c9ca727a Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 16 Feb 2011 16:27:41 -0800 Subject: Fix 3197205: Minor edits to device policy admin strings and documentation Change-Id: I3788772c375b916752cd8a98ff5d3751448e4334 --- core/java/android/app/admin/DeviceAdminReceiver.java | 6 +++--- core/java/android/app/admin/DevicePolicyManager.java | 10 +++++++--- core/res/res/values/strings.xml | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) (limited to 'core') diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index eccd7c9..29f8caf 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -148,7 +148,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { /** * Action periodically sent to a device administrator when the device password - * is expiring. + * is expiring. * *

The calling device admin must have requested * {@link DeviceAdminInfo#USES_POLICY_EXPIRE_PASSWORD} to receive @@ -266,8 +266,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver { /** * Called periodically when the password is about to expire or has expired. It will typically - * be called on device boot, once per day before the password expires and at the time when it - * expires. + * be called at these times: on device boot, once per day before the password expires, + * and at the time when the password expires. * *

If the password is not updated by the user, this method will continue to be called * once per day until the password is changed or the device admin disables password expiration. diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 3f3aa74..036443d 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -730,8 +730,10 @@ public class DevicePolicyManager { } /** - * Get the current password expiration timeout for the given admin or the aggregate - * of all admins if admin is null. + * Get the password expiration timeout for the given admin. The expiration timeout is the + * recurring expiration timeout provided in the call to + * {@link #setPasswordExpirationTimeout(ComponentName, long)} for the given admin or the + * aggregate of all policy administrators if admin is null. * * @param admin The name of the admin component to check, or null to aggregate all admins. * @return The timeout for the given admin or the minimum of all timeouts @@ -749,7 +751,9 @@ public class DevicePolicyManager { /** * Get the current password expiration time for the given admin or an aggregate of - * all admins if admin is null. + * all admins if admin is null. If the password is expired, this will return the time since + * the password expired as a negative number. If admin is null, then a composite of all + * expiration timeouts is returned - which will be the minimum of all timeouts. * * @param admin The name of the admin component to check, or null to aggregate all admins. * @return The password expiration time, in ms. diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d09210e..361bb6c 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1413,10 +1413,10 @@ to be used while policy is enabled. Only the first device admin sets the effective global proxy. - Set password expiration + Set lock-screen password expiration - Control how long before lockscreen password needs to be - changed + Control how frequently the lock-screen password must be + changed Set storage encryption -- cgit v1.1