Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99ff0a82 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

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: default avatarMike Lockwood <lockwood@android.com>
parent 3e42c35f
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -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);
                        }
                    }