commit 96f6a1a9e7806b34e7ae8c21b6febf965acf16e1
author Bill Yi <byi@google.com> Mon Jul 14 13:35:35 2014 -0700
committer Bill Yi <byi@google.com> Tue Jul 15 22:50:55 2014 +0000
tree ff6c4ac91866f60832786d204ce3f104a3da4ebf
parent 5a19dd522f010c459e8557beaf4526c322a98aff

DO NOT MERGE - Fix build issue isScreenOn

Change-Id: I8821efd561d375c32702be55903fe401ab719e80

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 48bbe58..44ea4f3 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1070,7 +1070,7 @@
         initializeHdmiState();
 
         // Match current screen state.
-        if (mPowerManager.isScreenOn()) {
+        if (mPowerManager.isInteractive()) {
             wakingUp(null);
         } else {
             goingToSleep(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
@@ -4077,7 +4077,7 @@
                                 telephonyService.silenceRinger();
                             } else if ((mIncallPowerBehavior
                                     & Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0
-                                    && telephonyService.isOffhook() && isScreenOn) {
+                                    && telephonyService.isOffhook() && interactive) {
                                 // Otherwise, if "Power button ends call" is enabled,
                                 // the Power button will hang up any current active call.
                                 hungUp = telephonyService.endCall();