commit a038decb21419c42a70c83a84c3b8ba152524913
author Mike Lockwood <lockwood@android.com> Thu Sep 17 11:45:25 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 17 11:45:25 2009 -0700
tree 8e69e35cb3d9990a8c11eecb6313dbd5062daf79
parent 7ce29aa8d466d03ac109601e804edc94ea37a770
parent c2912a662d984e2f23187fa31e7e71122d9472d9

am c2912a66: Merge change 25490 into eclair

Merge commit 'c2912a662d984e2f23187fa31e7e71122d9472d9' into eclair-plus-aosp

* commit 'c2912a662d984e2f23187fa31e7e71122d9472d9':
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."

core/java/android/view/WindowManagerPolicy.java

diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index c40107b..bd38b2d 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -361,8 +361,6 @@
     public final int OFF_BECAUSE_OF_USER = 1;
     /** Screen turned off because of timeout */
     public final int OFF_BECAUSE_OF_TIMEOUT = 2;
-    /** Screen turned off because of proximity sensor */
-    public final int OFF_BECAUSE_OF_PROXIMITY_SENSOR = 3;
 
     /**
      * Magic constant to {@link IWindowManager#setRotation} to not actually

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 35f508b8..84250bc 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -957,9 +957,6 @@
 
     private void sendNotificationLocked(boolean on, int why)
     {
-        if (mProximitySensorActive) {
-            why = WindowManagerPolicy.OFF_BECAUSE_OF_PROXIMITY_SENSOR;
-        }
         if (!on) {
             mStillNeedSleepNotification = false;
         }