Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6c97fcab: Power Manager light sensor fixes:

Browse Source 
Merge commit '6c97fcabbc4592a115afa5f3357b3172c4791855' into eclair-mr2

* commit '6c97fcabbc4592a115afa5f3357b3172c4791855':
  Power Manager light sensor fixes:
This commit is contained in:
Mike Lockwood
2009-10-20 09:22:37 -07:00
committed by Android Git Automerger
parent aa033b7971 6c97fcabbc
commit bca5bb8a25
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -477,8 +477,13 @@ class PowerManagerService extends IPowerManager.Stub
// And explicitly do the initial update of our cached settings // And explicitly do the initial update of our cached settings
updateGservicesValues(); updateGservicesValues();
// turn everything on if (mAutoBrightessEnabled) {
setPowerState(ALL_BRIGHT); // turn the screen on
setPowerState(SCREEN_BRIGHT);
} else {
// turn everything on
setPowerState(ALL_BRIGHT);
}
synchronized (mHandlerThread) { synchronized (mHandlerThread) {
mInitComplete = true; mInitComplete = true;
@@ -1285,6 +1290,9 @@ class PowerManagerService extends IPowerManager.Stub
// make sure button and key backlights are off too // make sure button and key backlights are off too
mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_BUTTONS, 0); mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_BUTTONS, 0);
mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_KEYBOARD, 0); mHardware.setLightBrightness_UNCHECKED(HardwareService.LIGHT_ID_KEYBOARD, 0);
// clear current value so we will update based on the new conditions
// when the sensor is reenabled.
mLightSensorValue = -1;
} }
} }
return err; return err;
@@ -1323,7 +1331,7 @@ class PowerManagerService extends IPowerManager.Stub
return; return;
} }
if (!mDoneBooting) { if (!mDoneBooting && !mAutoBrightessEnabled) {
newState |= ALL_BRIGHT; newState |= ALL_BRIGHT;
} }
@@ -2275,6 +2283,7 @@ class PowerManagerService extends IPowerManager.Stub
SensorManager.SENSOR_DELAY_NORMAL); SensorManager.SENSOR_DELAY_NORMAL);
} else { } else {
mSensorManager.unregisterListener(mLightListener); mSensorManager.unregisterListener(mLightListener);
mHandler.removeCallbacks(mAutoBrightnessTask);
} }
} }
} }
@@ -2319,8 +2328,14 @@ class PowerManagerService extends IPowerManager.Stub
} }
mHandler.removeCallbacks(mAutoBrightnessTask); mHandler.removeCallbacks(mAutoBrightnessTask);
if (mLightSensorValue != value) { if (mLightSensorValue != value) {
mLightSensorPendingValue = value; if (mLightSensorValue == -1) {
mHandler.postDelayed(mAutoBrightnessTask, LIGHT_SENSOR_DELAY); // process the value immediately
lightSensorChangedLocked(value);
} else {
// delay processing to debounce the sensor
mLightSensorPendingValue = value;
mHandler.postDelayed(mAutoBrightnessTask, LIGHT_SENSOR_DELAY);
}
} else { } else {
mLightSensorPendingValue = -1; mLightSensorPendingValue = -1;
} }