Merge "Revert "PowerManagerService: Remove assumption that light sensor will... (141fc986) · Commits · e / os / android_frameworks_base

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

+35 −43

Original line number	Diff line number	Diff line
		@@ -1698,6 +1698,11 @@ public class PowerManagerService extends IPowerManager.Stub
		// make sure button and key backlights are off too
		mButtonLight.turnOff();
		mKeyboardLight.turnOff();
		// clear current value so we will update based on the new conditions
		// when the sensor is reenabled.
		mLightSensorValue = -1;
		// reset our highest light sensor value when the screen turns off
		mHighestLightSensorValue = -1;
		}
		}
		}
		@@ -2467,7 +2472,6 @@ public class PowerManagerService extends IPowerManager.Stub
		synchronized (mLocks) {
		mIsDocked = (state != Intent.EXTRA_DOCK_STATE_UNDOCKED);
		if (mIsDocked) {
		// allow brightness to decrease when docked
		mHighestLightSensorValue = -1;
		}
		if ((mPowerState & SCREEN_ON_BIT) != 0) {
		@@ -3043,21 +3047,11 @@ public class PowerManagerService extends IPowerManager.Stub
		long identity = Binder.clearCallingIdentity();
		try {
		if (enable) {
		// reset our highest value when reenabling
		mHighestLightSensorValue = -1;
		// force recompute of backlight values
		if (mLightSensorValue >= 0) {
		int value = (int)mLightSensorValue;
		mLightSensorValue = -1;
		handleLightSensorValue(value);
		}
		mSensorManager.registerListener(mLightListener, mLightSensor,
		SensorManager.SENSOR_DELAY_NORMAL);
		} else {
		mSensorManager.unregisterListener(mLightListener);
		mHandler.removeCallbacks(mAutoBrightnessTask);
		mLightSensorPendingDecrease = false;
		mLightSensorPendingIncrease = false;
		}
		} finally {
		Binder.restoreCallingIdentity(identity);
		@@ -3109,8 +3103,19 @@ public class PowerManagerService extends IPowerManager.Stub
		}
		};

		private void handleLightSensorValue(int value) {
		SensorEventListener mLightListener = new SensorEventListener() {
		public void onSensorChanged(SensorEvent event) {
		synchronized (mLocks) {
		// ignore light sensor while screen is turning off
		if (isScreenTurningOffLocked()) {
		return;
		}

		int value = (int)event.values[0];
		long milliseconds = SystemClock.elapsedRealtime();
		if (mDebugLightSensor) {
		Slog.d(TAG, "onSensorChanged: light value: " + value);
		}
		if (mLightSensorValue == -1 \|\|
		milliseconds < mLastScreenOnTime + mLightSensorWarmupTime) {
		// process the value immediately if screen has just turned on
		@@ -3136,19 +3141,6 @@ public class PowerManagerService extends IPowerManager.Stub
		}
		}
		}

		SensorEventListener mLightListener = new SensorEventListener() {
		public void onSensorChanged(SensorEvent event) {
		if (mDebugLightSensor) {
		Slog.d(TAG, "onSensorChanged: light value: " + event.values[0]);
		}
		synchronized (mLocks) {
		// ignore light sensor while screen is turning off
		if (isScreenTurningOffLocked()) {
		return;
		}
		handleLightSensorValue((int)event.values[0]);
		}
		}

		public void onAccuracyChanged(Sensor sensor, int accuracy) {