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

Commit 69785934 authored by Arthur Hung's avatar Arthur Hung Committed by Android (Google) Code Review
Browse files

Merge "Turn off the screen if no security lock" into tm-dev

parents 48b334a4 8a100c13

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    break;

                }

                case SHORT_PRESS_POWER_LOCK_OR_SLEEP: {

                    if (keyguardOn()) {

                    if (mKeyguardDelegate == null || !mKeyguardDelegate.hasKeyguard()

                            || !mKeyguardDelegate.isSecure(mCurrentUserId) || keyguardOn()) {

                        sleepDefaultDisplayFromPowerButton(eventTime, 0);

                    } else {

                        lockNow(null /*options*/);