Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE - Fix build issue isScreenOn

Browse Source 
Change-Id: I8821efd561d375c32702be55903fe401ab719e80
This commit is contained in:
Bill Yi
2014-07-14 13:35:35 -07:00
parent 5a19dd522f
commit 96f6a1a9e7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -1070,7 +1070,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
initializeHdmiState(); initializeHdmiState();
// Match current screen state. // Match current screen state.
if (mPowerManager.isScreenOn()) { if (mPowerManager.isInteractive()) {
wakingUp(null); wakingUp(null);
} else { } else {
goingToSleep(WindowManagerPolicy.OFF_BECAUSE_OF_USER); goingToSleep(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
@@ -4077,7 +4077,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
telephonyService.silenceRinger(); telephonyService.silenceRinger();
} else if ((mIncallPowerBehavior } else if ((mIncallPowerBehavior
& Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0 & Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0
&& telephonyService.isOffhook() && isScreenOn) { && telephonyService.isOffhook() && interactive) {
// Otherwise, if "Power button ends call" is enabled, // Otherwise, if "Power button ends call" is enabled,
// the Power button will hang up any current active call. // the Power button will hang up any current active call.
hungUp = telephonyService.endCall(); hungUp = telephonyService.endCall();