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

am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo

Browse Source 
Merge commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a' into froyo-plus-aosp

* commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a':
  Fix inconsistency in how we handle light sensor when battery is low.
This commit is contained in:
Mike Lockwood
2010-04-19 08:22:39 -07:00
committed by Android Git Automerger
parent c2093636db 3110bf6df1
commit daa107c81d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1730,7 +1730,7 @@ class PowerManagerService extends IPowerManager.Stub
} }
if (offMask != 0) { if (offMask != 0) {
//Slog.i(TAG, "Setting brightess off: " + offMask); if (mSpew) Slog.i(TAG, "Setting brightess off: " + offMask);
setLightBrightness(offMask, Power.BRIGHTNESS_OFF); setLightBrightness(offMask, Power.BRIGHTNESS_OFF);
} }
if (dimMask != 0) { if (dimMask != 0) {
@@ -1739,7 +1739,7 @@ class PowerManagerService extends IPowerManager.Stub
brightness > Power.BRIGHTNESS_LOW_BATTERY) { brightness > Power.BRIGHTNESS_LOW_BATTERY) {
brightness = Power.BRIGHTNESS_LOW_BATTERY; brightness = Power.BRIGHTNESS_LOW_BATTERY;
} }
//Slog.i(TAG, "Setting brightess dim " + brightness + ": " + offMask); if (mSpew) Slog.i(TAG, "Setting brightess dim " + brightness + ": " + dimMask);
setLightBrightness(dimMask, brightness); setLightBrightness(dimMask, brightness);
} }
if (onMask != 0) { if (onMask != 0) {
@@ -1748,7 +1748,7 @@ class PowerManagerService extends IPowerManager.Stub
brightness > Power.BRIGHTNESS_LOW_BATTERY) { brightness > Power.BRIGHTNESS_LOW_BATTERY) {
brightness = Power.BRIGHTNESS_LOW_BATTERY; brightness = Power.BRIGHTNESS_LOW_BATTERY;
} }
//Slog.i(TAG, "Setting brightess on " + brightness + ": " + onMask); if (mSpew) Slog.i(TAG, "Setting brightess on " + brightness + ": " + onMask);
setLightBrightness(onMask, brightness); setLightBrightness(onMask, brightness);
} }
} }
@@ -1883,6 +1883,10 @@ class PowerManagerService extends IPowerManager.Stub
private int applyButtonState(int state) { private int applyButtonState(int state) {
int brightness = -1; int brightness = -1;
if ((state & BATTERY_LOW_BIT) != 0) {
// do not override brightness if the battery is low
return state;
}
if (mButtonBrightnessOverride >= 0) { if (mButtonBrightnessOverride >= 0) {
brightness = mButtonBrightnessOverride; brightness = mButtonBrightnessOverride;
} else if (mLightSensorButtonBrightness >= 0 && mUseSoftwareAutoBrightness) { } else if (mLightSensorButtonBrightness >= 0 && mUseSoftwareAutoBrightness) {
@@ -1899,6 +1903,10 @@ class PowerManagerService extends IPowerManager.Stub
private int applyKeyboardState(int state) { private int applyKeyboardState(int state) {
int brightness = -1; int brightness = -1;
if ((state & BATTERY_LOW_BIT) != 0) {
// do not override brightness if the battery is low
return state;
}
if (!mKeyboardVisible) { if (!mKeyboardVisible) {
brightness = 0; brightness = 0;
} else if (mButtonBrightnessOverride >= 0) { } else if (mButtonBrightnessOverride >= 0) {