Merge "Don't dismiss keyguard when enabling it" into qt-dev am: 785a88846a am: ecfa99dab7

am: 7f3238b910 Change-Id: I96f550eac54e3a176c7eee3090c7bb6737a4a3c2
2019-06-24 13:08:38 -07:00
parent eec9ed5042 7f3238b910
commit 4351733d66
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
@@ -11020,7 +11020,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)