From 952211b4ae8fa8cd626ae5a077b87924f35e0081 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Mon, 2 Nov 2009 14:17:57 -0500
Subject: [PATCH] Fix problem with proximity sensor not reawaking screen if the
 values change too quickly.

The logic that disables user activity while turning off the screen should not affect proximity sensor.

Fixes bug b/2228734 (in-call, prox sensor gets confused)

Change-Id: Ieca126e6f79bf7baa5741981aea72d306ba03edc
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 services/java/com/android/server/PowerManagerService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index f68bcbbcb7346..8a7c28fc1fc17 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/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);