Update DPM.setKeyguardDisabled to also dismiss the keyguard
Currently if the keyguard is shown, setKeyguardDisabled does not
dismiss it but disables it for the future. This change also dismisses
the keyguard in this situation.
Test: manual
Bug: 64383815
Change-Id: Idb89f363510a18c741d335d96d11c5492c0eaee3
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index dd20241..6fd4541 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -6764,6 +6764,7 @@
return null;
}
+ // STOPSHIP: Remove reference to CUR_DEVELOPMENT before shipping
/**
* Called by a device owner to disable the keyguard altogether.
* <p>
@@ -6772,6 +6773,10 @@
* 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