Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 81c95088: am 70d1fe38: am e7ef4241: Fix volume keys when in-call and screen is off due to proximity sensor.

Browse Source 
Merge commit '81c950884faa981214ce7635afe9a65eae468697'

* commit '81c950884faa981214ce7635afe9a65eae468697':
  Fix volume keys when in-call and screen is off due to proximity sensor.
This commit is contained in:
Mike Lockwood
2009-12-02 20:26:23 -08:00
committed by Android Git Automerger
parent 3819f7083c cfbd6fd29d
commit defd2c20b0
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -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);
}
}