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

Commit 9f31f37a authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Show advanced reboot if using an insecure lock screen" into cm-10.1

parents 162845a8 e7b43b69

services/java/com/android/server/power/ShutdownThread.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public final class ShutdownThread extends Thread { 
                // See if the advanced reboot menu is enabled (only if primary user) and check the keyguard state

                boolean advancedReboot = isPrimary ? advancedRebootEnabled(context) : false;

                KeyguardManager km = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);

                boolean locked = km.inKeyguardRestrictedInputMode();

                boolean locked = km.inKeyguardRestrictedInputMode() && km.isKeyguardSecure();



                if (advancedReboot && !locked) {

                    // Include options in power menu for rebooting into recovery or bootloader