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

Commit 2c5429f3 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" 

* commit 'aaf23a9a':
  Hang off call by power button while screen is on
parents c91aae2f aaf23a9a

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

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

                                telephonyService.silenceRinger();

                            } else if ((mIncallPowerBehavior

                            } else if ((mIncallPowerBehavior

                                    & Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0

                                    & Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0

                                    && telephonyService.isOffhook()) {

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

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

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

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

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

                                hungUp = telephonyService.endCall();

                                hungUp = telephonyService.endCall();