From 96f6a1a9e7806b34e7ae8c21b6febf965acf16e1 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 14 Jul 2014 13:35:35 -0700
Subject: [PATCH] DO NOT MERGE - Fix build issue isScreenOn

Change-Id: I8821efd561d375c32702be55903fe401ab719e80
---
 .../com/android/internal/policy/impl/PhoneWindowManager.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 48bbe583d3a4e..44ea4f331c20b 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 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         initializeHdmiState();
 
         // Match current screen state.
-        if (mPowerManager.isScreenOn()) {
+        if (mPowerManager.isInteractive()) {
             wakingUp(null);
         } else {
             goingToSleep(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
@@ -4077,7 +4077,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                                 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();