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

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

Browse Source 
Merge commit '7efae9ae50923ebe1bd1b50c0397220b8f0d642f'

* commit '7efae9ae50923ebe1bd1b50c0397220b8f0d642f':
  PowerManagerService: Fix manual brightness mode.
This commit is contained in:
Mike Lockwood
2009-11-04 06:30:27 -08:00
committed by Android Git Automerger
parent 054951b0b4 7efae9ae50
commit 90635b9f7b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/PowerManagerService.java
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(),