Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 3197205: Minor edits to device policy admin strings and documentation

Browse Source 
Change-Id: I3788772c375b916752cd8a98ff5d3751448e4334
This commit is contained in:
Jim Miller
2011-02-16 16:27:41 -08:00
parent 284ff954f0
commit 6b85768058
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/admin/DeviceAdminReceiver.java
View File

@@ -148,7 +148,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
/**
* Action periodically sent to a device administrator when the device password
* is expiring.
* is expiring.
*
* <p>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.
*
* <p>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.

10
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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.

6
core/res/res/values/strings.xml
View File

@@ -1413,10 +1413,10 @@
to be used while policy is enabled. Only the first device admin
sets the effective global proxy.</string>
<!-- Title of policy access to enforce password expiration [CHAR LIMIT=30]-->
<string name="policylab_expirePassword">Set password expiration</string>
<string name="policylab_expirePassword">Set lock-screen password expiration</string>
<!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
<string name="policydesc_expirePassword">Control how long before lockscreen password needs to be
changed</string>
<string name="policydesc_expirePassword">Control how frequently the lock-screen password must be
changed</string>
<!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
<string name="policylab_encryptedStorage">Set storage encryption</string>
<!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->

4
services/java/com/android/server/DevicePolicyManagerService.java
View File

@@ -79,9 +79,9 @@ import java.util.Set;
* Implementation of the device policy APIs.
*/
public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
private static final int REQUEST_EXPIRE_PASSWORD = 5571;
private static final String TAG = "DevicePolicyManagerService";
static final String TAG = "DevicePolicyManagerService";
private static final int REQUEST_EXPIRE_PASSWORD = 5571;
private static final long EXPIRATION_GRACE_PERIOD_MS = 5 * 86400 * 1000; // 5 days, in ms