commit 52a586e034989d314d72d8c5f6fdaea99292f84d
author Ivan Podogov <ginkage@google.com> Mon Jun 24 13:01:30 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 24 13:01:30 2019 -0700
tree 98dfe60cd649ac86bec98c112fdbd018db49762b
parent a19fbdf51b23d39979880bb25f484b727d64fe75
parent 785a88846ab600a198e9d0118e04e0aecf74ea9d

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

Change-Id: Ife6f87734f0e8c215a7b439d5dfa0fbc5247d0ce

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 8b61208..e5518d0 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -11018,7 +11018,11 @@
                 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)