From 3ac2f66f4c898f82e80bc66ddaf223a7bccebe58 Mon Sep 17 00:00:00 2001 From: shower Date: Fri, 3 Jan 2014 15:33:50 +0800 Subject: 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 --- policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'policy') 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(); -- cgit v1.1