diff options
| author | Jeff Brown <jeffbrown@android.com> | 2014-03-11 00:11:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 00:11:10 +0000 |
| commit | daa1c96954f666b9f661501e11014a57533eefad (patch) | |
| tree | 0a895d88fabb5123eb7f5eddf4d642d665d9d84d /policy | |
| parent | f2e837e57900514a554f174a29730157160c1fa1 (diff) | |
| parent | aaf23a9a653457cccf54293b2ff76196718c7a1a (diff) | |
| download | frameworks_base-daa1c96954f666b9f661501e11014a57533eefad.zip frameworks_base-daa1c96954f666b9f661501e11014a57533eefad.tar.gz frameworks_base-daa1c96954f666b9f661501e11014a57533eefad.tar.bz2 | |
am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on"
* commit 'aaf23a9a653457cccf54293b2ff76196718c7a1a':
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 f53868b..393f2c1 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3992,7 +3992,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(); |