summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid van Tonder <david.vantonder@gmail.com>2013-08-02 19:01:33 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-08-02 19:01:33 +0000
commit9f31f37a385da00cf34730731379569c82bd359b (patch)
tree983438b17894d2d6ef7041e692d2de71c2006329
parent162845a8353a2bbb8c13f4404f6b26194fcbda32 (diff)
parente7b43b6965482ee4939ce8e87cf7bfac9360bbec (diff)
downloadframeworks_base-9f31f37a385da00cf34730731379569c82bd359b.zip
frameworks_base-9f31f37a385da00cf34730731379569c82bd359b.tar.gz
frameworks_base-9f31f37a385da00cf34730731379569c82bd359b.tar.bz2
Merge "Show advanced reboot if using an insecure lock screen" into cm-10.1
-rw-r--r--services/java/com/android/server/power/ShutdownThread.java2
1 files changed, 1 insertions, 1 deletions
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