From 315ada7fbb9e967c22e87b4921bec720ceb2c73c Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 11 Feb 2010 12:14:08 -0800 Subject: [PATCH] Get rid of the limit-unlock policy control. This is merged with force-lock. These both allow effectively the same thing, so there is no reason to junk up the user experience with them as separate entities. --- api/current.xml | 15 ++------------- core/java/android/app/DeviceAdminInfo.java | 19 ++++--------------- .../java/android/app/DevicePolicyManager.java | 2 +- core/res/res/values/strings.xml | 9 ++------- .../server/DevicePolicyManagerService.java | 2 +- 5 files changed, 10 insertions(+), 37 deletions(-) diff --git a/api/current.xml b/api/current.xml index b62cc9ad8389d..d3ec86a05d834 100644 --- a/api/current.xml +++ b/api/current.xml @@ -20396,7 +20396,7 @@ type="int" transient="false" volatile="false" - value="4" + value="3" static="true" final="true" deprecated="not deprecated" @@ -20414,17 +20414,6 @@ visibility="public" > - - To control this policy, the device admin must have a "limit-unlock" - * tag in the "uses-policies" section of its meta-data. - */ - public static final int USES_POLICY_LIMIT_UNLOCK = 3; - - /** - * A type of policy that this device admin can use: able to force the device - * to lock via{@link DevicePolicyManager#lockNow}. - * *

To control this policy, the device admin must have a "force-lock" * tag in the "uses-policies" section of its meta-data. */ - public static final int USES_POLICY_FORCE_LOCK = 4; + public static final int USES_POLICY_FORCE_LOCK = 3; /** * A type of policy that this device admin can use: able to factory @@ -106,7 +98,7 @@ public final class DeviceAdminInfo implements Parcelable { *

To control this policy, the device admin must have a "wipe-data" * tag in the "uses-policies" section of its meta-data. */ - public static final int USES_POLICY_WIPE_DATA = 5; + public static final int USES_POLICY_WIPE_DATA = 4; /** @hide */ public static class PolicyInfo { @@ -140,9 +132,6 @@ public final class DeviceAdminInfo implements Parcelable { sPoliciesDisplayOrder.add(new PolicyInfo(USES_POLICY_WATCH_LOGIN, "watch-login", com.android.internal.R.string.policylab_watchLogin, com.android.internal.R.string.policydesc_watchLogin)); - sPoliciesDisplayOrder.add(new PolicyInfo(USES_POLICY_LIMIT_UNLOCK, "limit-unlock", - com.android.internal.R.string.policylab_limitUnlock, - com.android.internal.R.string.policydesc_limitUnlock)); sPoliciesDisplayOrder.add(new PolicyInfo(USES_POLICY_FORCE_LOCK, "force-lock", com.android.internal.R.string.policylab_forceLock, com.android.internal.R.string.policydesc_forceLock)); diff --git a/core/java/android/app/DevicePolicyManager.java b/core/java/android/app/DevicePolicyManager.java index 847e879e1885c..82c43dc18ae9b 100644 --- a/core/java/android/app/DevicePolicyManager.java +++ b/core/java/android/app/DevicePolicyManager.java @@ -410,7 +410,7 @@ public class DevicePolicyManager { * the length that the user can set. It takes effect immediately. * *

The calling device admin must have requested - * {@link DeviceAdminInfo#USES_POLICY_LIMIT_UNLOCK} to be able to call + * {@link DeviceAdminInfo#USES_POLICY_FORCE_LOCK} to be able to call * this method; if it has not, a security exception will be thrown. * * @param admin Which {@link DeviceAdmin} this request is associated with. diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 7f6611137dcfc..9e596ef489d99 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1218,16 +1218,11 @@ Force your password to a new value, requiring the administrator give it to you before you can log in. - - Limit lock timeout - - Restrict the unlock timeout - durations you can select. Force lock - Force the device to immediately lock, - requiring that you re-enter its password. + Control when device locks, + requiring you re-enter its password. Erase all data diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index 1625d9f59152a..0a6c72e0dab3f 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -608,7 +608,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { throw new NullPointerException("ComponentName is null"); } ActiveAdmin ap = getActiveAdminForCallerLocked(who, - DeviceAdminInfo.USES_POLICY_LIMIT_UNLOCK); + DeviceAdminInfo.USES_POLICY_FORCE_LOCK); if (ap.maximumTimeToUnlock != timeMs) { ap.maximumTimeToUnlock = timeMs;