am 989b76aa: Merge change Ieca126e6 into eclair
Merge commit '989b76aadd92538c7ab4ca00c34508b42fda8cef' into eclair-mr2
* commit '989b76aadd92538c7ab4ca00c34508b42fda8cef':
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index f68bcbb..8a7c28f 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1803,6 +1803,8 @@
}
private void forceUserActivityLocked() {
+ // cancel animation so userActivity will succeed
+ mScreenBrightness.animating = false;
boolean savedActivityAllowed = mUserActivityAllowed;
mUserActivityAllowed = true;
userActivity(SystemClock.uptimeMillis(), false);