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

Commit 8e9ad375 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Hang off call by power button while screen is on" into cm-11.0

parents b24d4f1d b78f667e

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4864,7 +4864,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                                telephonyService.silenceRinger();

                            } else if ((mIncallPowerBehavior

                                    & Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0

                                    && telephonyService.isOffhook()) {

                                    && telephonyService.isOffhook() && isScreenOn) {

                                // Otherwise, if "Power button ends call" is enabled,

                                // the Power button will hang up any current active call.

                                hungUp = telephonyService.endCall();