am ae3e5bc9: am 89f5a462: Merge "More paths for turning on screen immediately." into jb-dev (ceeec4e6) · Commits · e / os / android_frameworks_base

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -2117,6 +2117,10 @@ public class PowerManagerService extends IPowerManager.Stub
		brightness = mScreenBrightnessDim;
		}
		}
		if (mWaitingForFirstLightSensor && (newState & SCREEN_ON_BIT) != 0) {
		steps = IMMEDIATE_ANIM_STEPS;
		}

		long identity = Binder.clearCallingIdentity();
		try {
		mBatteryStats.noteScreenBrightness(brightness);
		@@ -3359,6 +3363,7 @@ public class PowerManagerService extends IPowerManager.Stub
		}

		SensorEventListener mLightListener = new SensorEventListener() {
		@Override
		public void onSensorChanged(SensorEvent event) {
		if (mDebugLightSensor) {
		Slog.d(TAG, "onSensorChanged: light value: " + event.values[0]);
		@@ -3369,12 +3374,16 @@ public class PowerManagerService extends IPowerManager.Stub
		return;
		}
		handleLightSensorValue((int)event.values[0], mWaitingForFirstLightSensor);
		if (mWaitingForFirstLightSensor) {
		if (mWaitingForFirstLightSensor && !mPreparingForScreenOn) {
		if (mDebugLightAnimation) {
		Slog.d(TAG, "onSensorChanged: Clearing mWaitingForFirstLightSensor.");
		}
		mWaitingForFirstLightSensor = false;
		}
		}
		}

		@Override
		public void onAccuracyChanged(Sensor sensor, int accuracy) {
		// ignore
		}