Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52a586e0 authored by Ivan Podogov's avatar Ivan Podogov Committed by android-build-merger
Browse files

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

am: 785a8884

Change-Id: Ife6f87734f0e8c215a7b439d5dfa0fbc5247d0ce
parents a19fbdf5 785a8884

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

+5 −1
Original line number Diff line number Diff line
@@ -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)