Merge "Don't dismiss keyguard when enabling it" into qt-dev

am: 785a88846a Change-Id: I08ac9f6aa9bec70f0248cca128dba466c2754d82
2019-06-24 12:49:43 -07:00
parent 8ca77b32f0 785a88846a
commit ecfa99dab7
1 changed files with 5 additions and 1 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -11018,7 +11018,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
                return false;
            }
            mLockPatternUtils.setLockScreenDisabled(disabled, userId);
-            mInjector.getIWindowManager().dismissKeyguard(null /* callback */, null /* message */);
+            if (disabled) {
+                mInjector
+                        .getIWindowManager()
+                        .dismissKeyguard(null /* callback */, null /* message */);
+            }
            DevicePolicyEventLogger
                    .createEvent(DevicePolicyEnums.SET_KEYGUARD_DISABLED)
                    .setAdmin(who)