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

Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo

Browse Source
This commit is contained in:
Mike Lockwood
2010-06-10 15:28:31 -07:00
committed by Android (Google) Code Review
parent 8f2ca788f3 f527c715d7
commit f4a502a235
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1342,24 +1342,30 @@ class PowerManagerService extends IPowerManager.Stub
public void setScreenBrightnessOverride(int brightness) { public void setScreenBrightnessOverride(int brightness) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
if (mSpew) Slog.d(TAG, "setScreenBrightnessOverride " + brightness);
synchronized (mLocks) { synchronized (mLocks) {
if (mScreenBrightnessOverride != brightness) { if (mScreenBrightnessOverride != brightness) {
mScreenBrightnessOverride = brightness; mScreenBrightnessOverride = brightness;
if (isScreenOn()) {
updateLightsLocked(mPowerState, SCREEN_ON_BIT); updateLightsLocked(mPowerState, SCREEN_ON_BIT);
} }
} }
} }
}
public void setButtonBrightnessOverride(int brightness) { public void setButtonBrightnessOverride(int brightness) {
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
if (mSpew) Slog.d(TAG, "setButtonBrightnessOverride " + brightness);
synchronized (mLocks) { synchronized (mLocks) {
if (mButtonBrightnessOverride != brightness) { if (mButtonBrightnessOverride != brightness) {
mButtonBrightnessOverride = brightness; mButtonBrightnessOverride = brightness;
if (isScreenOn()) {
updateLightsLocked(mPowerState, BUTTON_BRIGHT_BIT | KEYBOARD_BRIGHT_BIT); updateLightsLocked(mPowerState, BUTTON_BRIGHT_BIT | KEYBOARD_BRIGHT_BIT);
} }
} }
} }
}
/** /**
* Sanity-check that gets called 5 seconds after any call to * Sanity-check that gets called 5 seconds after any call to