Merge change I305c181c into eclair
* changes:
Delay 500ms between each registering each SDP record using sdptool.
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index b2e3a8c..e1bea37 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1531,9 +1531,10 @@
} 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 @@
+ " 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 @@
+ noticeMe);
}
animating = true;
+ return true;
}
boolean stepLocked() {