commit c3f5d694324fbe2831405ce60bc43bd0d0183d07
author Jeff Brown <jeffbrown@android.com> Tue Mar 11 00:06:01 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 11 00:06:01 2014 +0000
tree c28736af2b18a7051387fa02578ea30739f70cfc
parent 35c8ebab0ac66bf2c12b6986f90a07be402e0076
parent 3ac2f66f4c898f82e80bc66ddaf223a7bccebe58

Merge "Hang off call by power button while screen is on"

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

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index c33bd35..aeaa18f 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3984,7 +3984,7 @@
                                 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();