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

Merge commit 'a94da0e7d98cdeae65cd48d4e7cfcf8f8b9aacfb'

* commit 'a94da0e7d98cdeae65cd48d4e7cfcf8f8b9aacfb':
  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);