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.
This commit is contained in:
Dianne Hackborn
2010-02-11 12:14:08 -08:00
parent 2870552b41
commit 315ada7fbb
5 changed files with 10 additions and 37 deletions

View File

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