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

am f836acf2: Merge change I067d55ea into eclair

Browse Source 
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2

* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
This commit is contained in:
Dianne Hackborn
2009-10-12 11:11:30 -07:00
committed by Android Git Automerger
parent f555bf65e1 f836acf241
commit 7fa610638b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1531,9 +1531,10 @@ class PowerManagerService extends IPowerManager.Stub
} finally {
Binder.restoreCallingIdentity(identity);
}
mScreenBrightness.setTargetLocked(brightness,
steps, INITIAL_SCREEN_BRIGHTNESS, nominalCurrentValue);
startAnimation = true;
if (mScreenBrightness.setTargetLocked(brightness,
steps, INITIAL_SCREEN_BRIGHTNESS, nominalCurrentValue)) {
startAnimation = true;
}
} else {
if ((newState & SCREEN_BRIGHT_BIT) == 0) {
// dim or turn off backlight, depending on if the screen is on
@@ -1612,11 +1613,13 @@ class PowerManagerService extends IPowerManager.Stub
+ " delta=" + delta);
}
void setTargetLocked(int target, int stepsToTarget, int initialValue,
boolean setTargetLocked(int target, int stepsToTarget, int initialValue,
int nominalCurrentValue) {
if (!initialized) {
initialized = true;
curValue = (float)initialValue;
} else if (targetValue == target) {
return false;
}
targetValue = target;
delta = (targetValue -
@@ -1630,6 +1633,7 @@ class PowerManagerService extends IPowerManager.Stub
+ noticeMe);
}
animating = true;
return true;
}
boolean stepLocked() {