From 99ff0a82907b18ff1d3b2828b4751802951f0085 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 2 Dec 2009 01:37:38 -0500 Subject: Fix volume keys when in-call and screen is off due to proximity sensor. Fixes bug b/2297262 (Volume keys on passion don't work while in-call and phone is pressed to my ear) Change-Id: I775daa24295482000f87273d1f84dd796fb0f4eb Signed-off-by: Mike Lockwood --- policy/com/android/internal/policy/impl/PhoneWindowManager.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'policy/com') diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java index 2f9faae..feb0717 100755 --- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1651,14 +1651,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (!mKeyguardMediator.onWakeKeyWhenKeyguardShowingTq(event.keycode) && (event.keycode == KeyEvent.KEYCODE_VOLUME_DOWN || event.keycode == KeyEvent.KEYCODE_VOLUME_UP)) { + // when keyguard is showing and screen off, we need + // to handle the volume key for calls and music here if (isInCall()) { - // if the keyguard didn't wake the device, we are in call, and - // it is a volume key, turn on the screen so that the user - // can more easily adjust the in call volume. - mKeyguardMediator.pokeWakelock(); + handleVolumeKey(AudioManager.STREAM_VOICE_CALL, event.keycode); } else if (isMusicActive()) { - // when keyguard is showing and screen off, we need - // to handle the volume key for music here handleVolumeKey(AudioManager.STREAM_MUSIC, event.keycode); } } -- cgit v1.1