Merge "Fix issue #5642121: Proximity sensor didn't turn the screen on in call" into ics-mr1 (9b518d93) · Commits · e / os / android_frameworks_base

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

+23 −9

Original line number	Diff line number	Diff line
		@@ -1689,6 +1689,11 @@ public class PowerManagerService extends IPowerManager.Stub
		// before showing it to the user. We want the light off
		// until it is ready to be shown to the user, not it using
		// whatever the last value it had.
		if (DEBUG_SCREEN_ON) {
		Slog.i(TAG, "Forcing brightness 0: mPowerState=0x"
		+ Integer.toHexString(mPowerState)
		+ " mSkippedScreenOn=" + mSkippedScreenOn);
		}
		mScreenBrightness.forceValueLocked(Power.BRIGHTNESS_OFF);
		}
		}
		@@ -2038,6 +2043,7 @@ public class PowerManagerService extends IPowerManager.Stub
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		if (!mSkippedScreenOn) {
		mScreenBrightness.setTargetLocked(brightness, steps,
		INITIAL_SCREEN_BRIGHTNESS, nominalCurrentValue);
		if (DEBUG_SCREEN_ON) {
		@@ -2046,6 +2052,7 @@ public class PowerManagerService extends IPowerManager.Stub
		Slog.i(TAG, "Setting screen brightness: " + brightness, e);
		}
		}
		}

		if (mSpew) {
		Slog.d(TAG, "offMask=0x" + Integer.toHexString(offMask)
		@@ -2086,6 +2093,11 @@ public class PowerManagerService extends IPowerManager.Stub
		? LightsService.BRIGHTNESS_MODE_SENSOR
		: LightsService.BRIGHTNESS_MODE_USER);
		if ((mask & SCREEN_BRIGHT_BIT) != 0) {
		if (DEBUG_SCREEN_ON) {
		RuntimeException e = new RuntimeException("here");
		e.fillInStackTrace();
		Slog.i(TAG, "Set LCD brightness: " + value, e);
		}
		mLcdLight.setBrightness(value, brightnessMode);
		}
		if ((mask & BUTTON_BRIGHT_BIT) != 0) {
		@@ -2137,7 +2149,7 @@ public class PowerManagerService extends IPowerManager.Stub
		delta = (targetValue -
		(nominalCurrentValue >= 0 ? nominalCurrentValue : curValue))
		/ stepsToTarget;
		if (mSpew) {
		if (mSpew \|\| DEBUG_SCREEN_ON) {
		String noticeMe = nominalCurrentValue == curValue ? "" : " ******************";
		Slog.i(TAG, "setTargetLocked mask=" + mask + " curValue=" + curValue
		+ " target=" + target + " targetValue=" + targetValue + " delta=" + delta
		@@ -2527,9 +2539,11 @@ public class PowerManagerService extends IPowerManager.Stub
		}

		if (mAutoBrightessEnabled && mScreenBrightnessOverride < 0) {
		if (!mSkippedScreenOn) {
		mScreenBrightness.setTargetLocked(lcdValue, AUTOBRIGHTNESS_ANIM_STEPS,
		INITIAL_SCREEN_BRIGHTNESS, (int)mScreenBrightness.curValue);
		}
		}
		if (mButtonBrightnessOverride < 0) {
		mButtonLight.setBrightness(buttonValue);
		}