From e7b43b6965482ee4939ce8e87cf7bfac9360bbec Mon Sep 17 00:00:00 2001 From: Veeti Paananen Date: Tue, 23 Jul 2013 16:34:35 +0300 Subject: Show advanced reboot if using an insecure lock screen Enables the advanced reboot menu when locked if the selected lock method is insecure (= slide unlock). Change-Id: I759b7b31c5411597e2537a85183d73ec02eb2461 --- services/java/com/android/server/power/ShutdownThread.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/power/ShutdownThread.java b/services/java/com/android/server/power/ShutdownThread.java index c2c678a0..9c10c9d 100644 --- a/services/java/com/android/server/power/ShutdownThread.java +++ b/services/java/com/android/server/power/ShutdownThread.java @@ -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 -- cgit v1.1