diff options
| author | Jeff Brown <jeffbrown@android.com> | 2014-03-11 00:37:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 00:37:57 +0000 |
| commit | 9a3ed5bd3c2e41702c16b39c0c8e125178c225d2 (patch) | |
| tree | 513e6e84f185bbc09631eecb138d22496fc27f25 /policy | |
| parent | 22c38e67d4e49f5f660f50fa4e1bd6359024cb91 (diff) | |
| parent | 70c274361ec6089c5ed9d1a62877d51b9ec1dcc8 (diff) | |
| download | frameworks_base-9a3ed5bd3c2e41702c16b39c0c8e125178c225d2.zip frameworks_base-9a3ed5bd3c2e41702c16b39c0c8e125178c225d2.tar.gz frameworks_base-9a3ed5bd3c2e41702c16b39c0c8e125178c225d2.tar.bz2 | |
am 70c27436: am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on"
* commit '70c274361ec6089c5ed9d1a62877d51b9ec1dcc8':
Hang off call by power button while screen is on
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 9ecb917..15a68ef 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3988,7 +3988,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(); |