am 6de8bbb0: am 27c6dd7a: PowerManagerService: Fix manual brightness mode.

Merge commit '6de8bbb00a6183c7d4eec76fa7f253cf80736422' into eclair-mr2-plus-aosp

* commit '6de8bbb00a6183c7d4eec76fa7f253cf80736422':
  PowerManagerService: Fix manual brightness mode.
This commit is contained in:
Mike Lockwood
2009-11-04 06:19:50 -08:00
committed by Android Git Automerger

View File

@@ -1760,7 +1760,8 @@ class PowerManagerService extends IPowerManager.Stub
try {
if (mScreenBrightnessOverride >= 0) {
return mScreenBrightnessOverride;
} else if (mLightSensorBrightness >= 0 && mUseSoftwareAutoBrightness) {
} else if (mLightSensorBrightness >= 0 && mUseSoftwareAutoBrightness
&& mAutoBrightessEnabled) {
return mLightSensorBrightness;
}
final int brightness = Settings.System.getInt(mContext.getContentResolver(),