From 5b87189249a825f9a679647c40db89a4560c79e9 Mon Sep 17 00:00:00 2001 From: Danesh Mondegarian Date: Fri, 16 Mar 2012 10:58:08 -0400 Subject: [PATCH] Lockscreen : Fix vol wake for lockscreen security type none Modified the logic so that when lockscreen type is set to none, it doesnt always wake up the device. Change-Id: I64d970a9f3c89b50c781c0046bcf21fb382a298a --- .../internal/policy/impl/PhoneWindowManager.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index efe928e181c13..2ba58b0678a1c 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2856,16 +2856,15 @@ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags, boolean i result = 0; final boolean isWakeKey = (policyFlags - & (WindowManagerPolicy.FLAG_WAKE | WindowManagerPolicy.FLAG_WAKE_DROPPED)) != 0 - || (((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) - && mVolumeWakeScreen && !isScreenOn); + & (WindowManagerPolicy.FLAG_WAKE | WindowManagerPolicy.FLAG_WAKE_DROPPED)) != 0; + if (down && isWakeKey) { if (keyguardActive) { // If the keyguard is showing, let it decide what to do with the wake key. mKeyguardMediator.onWakeKeyWhenKeyguardShowingTq(keyCode, mDockMode != Intent.EXTRA_DOCK_STATE_UNDOCKED); - } else { + } else if ((keyCode != KeyEvent.KEYCODE_VOLUME_UP) && (keyCode != KeyEvent.KEYCODE_VOLUME_DOWN)) { // Otherwise, wake the device ourselves. result |= ACTION_POKE_USER_ACTIVITY; } @@ -2992,6 +2991,9 @@ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags, boolean i keyCode = KeyEvent.KEYCODE_POWER; mKeyguardMediator.onWakeKeyWhenKeyguardShowingTq(keyCode, mDockMode != Intent.EXTRA_DOCK_STATE_UNDOCKED); + } else { + result |= ACTION_POKE_USER_ACTIVITY; + break; } }