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

Rename isScreenOn() to isInteractive().

Browse Source 
Fix build break due to an earlier merge.

Change-Id: I6e6583b251da9e027a4ade45cb4bb77e9d4ee624
This commit is contained in:
Jeff Brown
2014-04-11 02:15:54 -07:00
parent 4e5c089ef3
commit 26c6a50f03
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -986,7 +986,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
initializeHdmiState();
// Match current screen state.
if (mPowerManager.isScreenOn()) {
if (mPowerManager.isInteractive()) {
screenTurningOn(null);
} else {
screenTurnedOff(WindowManagerPolicy.OFF_BECAUSE_OF_USER);
@@ -3973,7 +3973,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case KeyEvent.KEYCODE_POWER: {
result &= ~ACTION_PASS_TO_USER;
if (down) {
boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(isScreenOn,
boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(interactive,
event.getDownTime(), isImmersiveMode(mLastSystemUiFlags));
if (panic) {
mHandler.post(mRequestTransientNav);
@@ -3995,7 +3995,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();

2
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -393,7 +393,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// Initialize screen state for battery stats.
try {
if (mPowerState.isScreenOn()) {
if (mPowerState.getScreenState() != Display.STATE_OFF) {
mBatteryStats.noteScreenOn();
} else {
mBatteryStats.noteScreenOff();