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

Commit 4351733d 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 am: ecfa99da 

am: 7f3238b9

Change-Id: I96f550eac54e3a176c7eee3090c7bb6737a4a3c2
parents eec9ed50 7f3238b9

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

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