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

Commit eae063eb authored by Hongwei Wang's avatar Hongwei Wang Committed by android-build-merger
Browse files

Merge "Dispatch volume key event when mHandleVolumeKeysInWM is set" into pi-dev am: 6de87296 

am: 3a763e30

Change-Id: I0a1c145bd5c2af64af39b3884a0c54ee8c8c7cc3
parents c35a1e8e 3a763e30

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −1
Original line number Diff line number Diff line
@@ -6153,7 +6153,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    sendSystemKeyToStatusBarAsync(event.getKeyCode());



                    TelecomManager telecomManager = getTelecommService();

                    if (telecomManager != null) {

                    if (telecomManager != null && !mHandleVolumeKeysInWM) {

                        // When {@link #mHandleVolumeKeysInWM} is set, volume key events

                        // should be dispatched to WM.

                        if (telecomManager.isRinging()) {

                            // If an incoming call is ringing, either VOLUME key means

                            // "silence ringer".  We handle these keys here, rather than