am 27c6dd7a: PowerManagerService: Fix manual brightness mode.

Merge commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116' into eclair-mr2

* commit '27c6dd7aa4ff6f57435a3c87d8b9a782cf7c9116':
  PowerManagerService: Fix manual brightness mode.
This commit is contained in:
Mike Lockwood
2009-11-04 06:10:37 -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(),