diff options
author | Sam Mortimer <sam@mortimer.me.uk> | 2013-07-15 17:58:40 -0700 |
---|---|---|
committer | Sam Mortimer <sam@mortimer.me.uk> | 2013-07-15 20:19:28 -0700 |
commit | 6c33ad36e429b3a3ad69e53275714ca43cdc03fe (patch) | |
tree | da1c096578c71cb7ae8dbc2ece950bb02773f14b | |
parent | 6e84c457264a3d6b90a2bdcee5b188373b2d0291 (diff) | |
download | frameworks_base-6c33ad36e429b3a3ad69e53275714ca43cdc03fe.zip frameworks_base-6c33ad36e429b3a3ad69e53275714ca43cdc03fe.tar.gz frameworks_base-6c33ad36e429b3a3ad69e53275714ca43cdc03fe.tar.bz2 |
Always prevent wake on home keypress when kl config does not contain WAKE
http://review.cyanogenmod.org/#/c/43124/ introduced a change in behaviour
where the home key could wake a device even if the kl config lacked
the WAKE option. This fix restores the original behaviour.
Change-Id: I56fc23244957a5738823b5e59f0a719670b41f6d
-rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index f620c6d..7415a1f 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3964,7 +3964,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { break; } case KeyEvent.KEYCODE_HOME: - if (down && !isScreenOn && mHomeWakeScreen) { + if (down && !isScreenOn && isWakeKey && mHomeWakeScreen) { if (keyguardActive) { // If the keyguard is showing, let it wake the device when ready. mKeyguardMediator.onWakeKeyWhenKeyguardShowingTq(keyCode); |