am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent. (bb689496) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/PowerManagerService.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -1590,12 +1590,9 @@ public final class PowerManagerService extends com.android.server.SystemService
		\| DIRTY_ACTUAL_DISPLAY_POWER_STATE_UPDATED \| DIRTY_BOOT_COMPLETED
		\| DIRTY_SETTINGS \| DIRTY_SCREEN_ON_BLOCKER_RELEASED)) != 0) {
		final int newScreenState = getDesiredScreenPowerStateLocked();
		if (newScreenState != mDisplayPowerRequest.screenState) {
		mDisplayPowerRequest.screenState = newScreenState;
		nativeSetPowerState(
		mDisplayPowerRequest.wantScreenOnNormal(),
		nativeSetPowerState(isScreenOnLocked(),
		newScreenState == DisplayPowerRequest.SCREEN_STATE_BRIGHT);
		}

		int screenBrightness = mScreenBrightnessSettingDefault;
		float screenAutoBrightnessAdjustment = 0.0f;
		@@ -1805,9 +1802,13 @@ public final class PowerManagerService extends com.android.server.SystemService

		private boolean isScreenOnInternal() {
		synchronized (mLock) {
		return !mSystemReady
		\|\| mDisplayPowerRequest.wantScreenOnNormal();
		return isScreenOnLocked();
		}
		}

		private boolean isScreenOnLocked() {
		return mWakefulness == WAKEFULNESS_AWAKE
		\|\| mWakefulness == WAKEFULNESS_DREAMING;
		}

		private void handleBatteryStateChangedLocked() {