drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0

Browse Source
This commit is contained in:
Mike Lockwood
2011-10-13 13:59:33 -07:00
committed by Android (Google) Code Review
parent e89b69691f 5dca30affc
commit ab9d5b1173
1 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
services/java/com/android/server/PowerManagerService.java
View File

@ -1698,11 +1698,6 @@ public class PowerManagerService extends IPowerManager.Stub
// make sure button and key backlights are off too // make sure button and key backlights are off too
mButtonLight.turnOff(); mButtonLight.turnOff();
mKeyboardLight.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;
} }
} }
} }
@ -2472,6 +2467,7 @@ public class PowerManagerService extends IPowerManager.Stub
synchronized (mLocks) { synchronized (mLocks) {
mIsDocked = (state != Intent.EXTRA_DOCK_STATE_UNDOCKED); mIsDocked = (state != Intent.EXTRA_DOCK_STATE_UNDOCKED);
if (mIsDocked) { if (mIsDocked) {
// allow brightness to decrease when docked
mHighestLightSensorValue = -1; mHighestLightSensorValue = -1;
} }
if ((mPowerState & SCREEN_ON_BIT) != 0) { if ((mPowerState & SCREEN_ON_BIT) != 0) {
@ -3047,11 +3043,21 @@ public class PowerManagerService extends IPowerManager.Stub
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
if (enable) { 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, mSensorManager.registerListener(mLightListener, mLightSensor,
SensorManager.SENSOR_DELAY_NORMAL); SensorManager.SENSOR_DELAY_NORMAL);
} else { } else {
mSensorManager.unregisterListener(mLightListener); mSensorManager.unregisterListener(mLightListener);
mHandler.removeCallbacks(mAutoBrightnessTask); mHandler.removeCallbacks(mAutoBrightnessTask);
mLightSensorPendingDecrease = false;
mLightSensorPendingIncrease = false;
} }
} finally { } finally {
Binder.restoreCallingIdentity(identity); Binder.restoreCallingIdentity(identity);
@ -3103,43 +3109,45 @@ public class PowerManagerService extends IPowerManager.Stub
} }
}; };
private void handleLightSensorValue(int value) {
long milliseconds = SystemClock.elapsedRealtime();
if (mLightSensorValue == -1 ||
milliseconds < mLastScreenOnTime + mLightSensorWarmupTime) {
// process the value immediately if screen has just turned on
mHandler.removeCallbacks(mAutoBrightnessTask);
mLightSensorPendingDecrease = false;
mLightSensorPendingIncrease = false;
lightSensorChangedLocked(value);
} else {
if ((value > mLightSensorValue && mLightSensorPendingDecrease) ||
(value < mLightSensorValue && mLightSensorPendingIncrease) ||
(value == mLightSensorValue) ||
(!mLightSensorPendingDecrease && !mLightSensorPendingIncrease)) {
// delay processing to debounce the sensor
mHandler.removeCallbacks(mAutoBrightnessTask);
mLightSensorPendingDecrease = (value < mLightSensorValue);
mLightSensorPendingIncrease = (value > mLightSensorValue);
if (mLightSensorPendingDecrease || mLightSensorPendingIncrease) {
mLightSensorPendingValue = value;
mHandler.postDelayed(mAutoBrightnessTask, LIGHT_SENSOR_DELAY);
}
} else {
mLightSensorPendingValue = value;
}
}
}
SensorEventListener mLightListener = new SensorEventListener() { SensorEventListener mLightListener = new SensorEventListener() {
public void onSensorChanged(SensorEvent event) { public void onSensorChanged(SensorEvent event) {
if (mDebugLightSensor) {
Slog.d(TAG, "onSensorChanged: light value: " + event.values[0]);
}
synchronized (mLocks) { synchronized (mLocks) {
// ignore light sensor while screen is turning off // ignore light sensor while screen is turning off
if (isScreenTurningOffLocked()) { if (isScreenTurningOffLocked()) {
return; return;
} }
handleLightSensorValue((int)event.values[0]);
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
mHandler.removeCallbacks(mAutoBrightnessTask);
mLightSensorPendingDecrease = false;
mLightSensorPendingIncrease = false;
lightSensorChangedLocked(value);
} else {
if ((value > mLightSensorValue && mLightSensorPendingDecrease) ||
(value < mLightSensorValue && mLightSensorPendingIncrease) ||
(value == mLightSensorValue) ||
(!mLightSensorPendingDecrease && !mLightSensorPendingIncrease)) {
// delay processing to debounce the sensor
mHandler.removeCallbacks(mAutoBrightnessTask);
mLightSensorPendingDecrease = (value < mLightSensorValue);
mLightSensorPendingIncrease = (value > mLightSensorValue);
if (mLightSensorPendingDecrease || mLightSensorPendingIncrease) {
mLightSensorPendingValue = value;
mHandler.postDelayed(mAutoBrightnessTask, LIGHT_SENSOR_DELAY);
}
} else {
mLightSensorPendingValue = value;
}
}
} }
} }