commit 06952d9299c23ee15df0825e75934971cfecf2ba
author Mike Lockwood <lockwood@android.com> Thu Aug 13 16:05:38 2009 -0400
committer Mike Lockwood <lockwood@android.com> Mon Aug 17 06:56:43 2009 -0400
tree 17c6acac8c7ffc4875d2e0ee7e1840772a4e6307
parent 8af2d22552c61d8d4e09e52287f056428172ab05

DO NOT MERGE - cherry-picked from master:

PowerManager: Fix problem waking screen from negative proximity sensor events.

Fixes bug b/2048591

Signed-off-by: Mike Lockwood <lockwood@android.com>

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

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 447e9fa..1249289 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2054,7 +2054,15 @@
         if (event.values[0] == 0.0) {
             goToSleep(milliseconds);
         } else {
-            userActivity(milliseconds, false);
+            // proximity sensor negative events user activity.
+            // temporarily set mUserActivityAllowed to true so this will work
+            // even when the keyguard is on.
+            synchronized (mLocks) {
+                boolean savedActivityAllowed = mUserActivityAllowed;
+                mUserActivityAllowed = true;
+                userActivity(milliseconds, false);
+                mUserActivityAllowed = savedActivityAllowed;
+            }
         }
     }