From 315ada7fbb9e967c22e87b4921bec720ceb2c73c Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 11 Feb 2010 12:14:08 -0800 Subject: 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. --- core/java/android/app/DeviceAdminInfo.java | 19 ++++--------------- core/java/android/app/DevicePolicyManager.java | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) (limited to 'core/java/android/app') diff --git a/core/java/android/app/DeviceAdminInfo.java b/core/java/android/app/DeviceAdminInfo.java index ab9c44f..031bc8e 100644 --- a/core/java/android/app/DeviceAdminInfo.java +++ b/core/java/android/app/DeviceAdminInfo.java @@ -80,23 +80,15 @@ public final class DeviceAdminInfo implements Parcelable { public static final int USES_POLICY_RESET_PASSWORD = 2; /** - * A type of policy that this device admin can use: able to limit the + * A type of policy that this device admin can use: able to force the device + * to lock via{@link DevicePolicyManager#lockNow} or limit the * maximum lock timeout for the device via * {@link DevicePolicyManager#setMaximumTimeToLock}. * - *

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 847e879..82c43dc 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. -- cgit v1.1