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

Commit 785a8884 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 18fff174 680e3579

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)