am 26c6a50f: Rename isScreenOn() to isInteractive(). (861aa007) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -989,7 +989,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);
		@@ -4009,7 +4009,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);
		@@ -4031,7 +4031,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();

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();