summaryrefslogtreecommitdiffstats
path: root/policy/src/com/android/internal
diff options
context:
space:
mode:
authorshower <shower929@gmail.com>2014-01-03 15:33:50 +0800
committershower <shower929@gmail.com>2014-01-03 15:33:50 +0800
commit3ac2f66f4c898f82e80bc66ddaf223a7bccebe58 (patch)
tree8f9f6f74577006e578558b2834b19b713f25a86a /policy/src/com/android/internal
parent584ace0d3f79ff43db9298798065dd5beaa66a45 (diff)
downloadframeworks_base-3ac2f66f4c898f82e80bc66ddaf223a7bccebe58.zip
frameworks_base-3ac2f66f4c898f82e80bc66ddaf223a7bccebe58.tar.gz
frameworks_base-3ac2f66f4c898f82e80bc66ddaf223a7bccebe58.tar.bz2
Hang off call by power button while screen is on
Enable power button end call and screen is off. User use power button to turn on screen will end call. Should turn on screen and not end call Change-Id: Idf34f7724dbf1796205332c5c7ef663102f8a30c Signed-off-by: shower <shower929@gmail.com>
Diffstat (limited to 'policy/src/com/android/internal')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java2
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 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 @@ 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();