diff options
| author | Veeti Paananen <veeti.paananen@rojekti.fi> | 2013-07-23 16:34:35 +0300 |
|---|---|---|
| committer | Veeti Paananen <veeti.paananen@rojekti.fi> | 2013-07-23 16:34:35 +0300 |
| commit | e7b43b6965482ee4939ce8e87cf7bfac9360bbec (patch) | |
| tree | 2315ed6f39665442b0f0bddfde483120a295a67f /services | |
| parent | aa18a86e9635b069c74c18c2b89a67e7dd403b5c (diff) | |
| download | frameworks_base-e7b43b6965482ee4939ce8e87cf7bfac9360bbec.zip frameworks_base-e7b43b6965482ee4939ce8e87cf7bfac9360bbec.tar.gz frameworks_base-e7b43b6965482ee4939ce8e87cf7bfac9360bbec.tar.bz2 | |
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
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/power/ShutdownThread.java | 2 |
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 |