am e94261b8: am 989b76aa: Merge change Ieca126e6 into eclair

Merge commit 'e94261b874b7d0704dade14540dbb9477a828163' into eclair-mr2-plus-aosp

* commit 'e94261b874b7d0704dade14540dbb9477a828163':
  Fix problem with proximity sensor not reawaking screen if the values change too quickly.

services/java/com/android/server/PowerManagerService.java

@@ -1803,6 +1803,8 @@ class PowerManagerService extends IPowerManager.Stub
     }
 
     private void forceUserActivityLocked() {
+        // cancel animation so userActivity will succeed
+        mScreenBrightness.animating = false;
         boolean savedActivityAllowed = mUserActivityAllowed;
         mUserActivityAllowed = true;
         userActivity(SystemClock.uptimeMillis(), false);