diff options
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 5 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index d6ef97b545e6..9e95157b1fc3 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -6784,6 +6784,7 @@ public class DevicePolicyManager { return null; } + // STOPSHIP: Remove reference to CUR_DEVELOPMENT before shipping /** * Called by a device owner to disable the keyguard altogether. * <p> @@ -6792,6 +6793,10 @@ public class DevicePolicyManager { * password, pin or pattern is set after the keyguard was disabled, the keyguard stops being * disabled. * + * <p> + * As of {@link android.os.Build.VERSION_CODES#CUR_DEVELOPMENT}, this call also dismisses the + * keyguard if it is currently shown. + * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param disabled {@code true} disables the keyguard, {@code false} reenables it. * @return {@code false} if attempting to disable the keyguard while a lock password was in diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index de6f002ebd66..e8724aae2894 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -9085,6 +9085,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return false; } mLockPatternUtils.setLockScreenDisabled(disabled, userId); + mInjector.getIWindowManager().dismissKeyguard(null); + } catch (RemoteException e) { + // Same process, does not happen. } finally { mInjector.binderRestoreCallingIdentity(ident); } |