From c17f07aa0468424e3475d7761313b761372d1860 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Thu, 17 Sep 2009 11:47:56 -0400 Subject: Revert "Don't activate keyguard if screen is turned off while proximity sensor is active." This reverts commit ddfe879b783ad72603308e28e8f683454464684e. --- core/java/android/view/WindowManagerPolicy.java | 2 -- services/java/com/android/server/PowerManagerService.java | 3 --- 2 files changed, 5 deletions(-) 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 interface WindowManagerPolicy { 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 diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 35f508b..84250bc 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -957,9 +957,6 @@ class PowerManagerService extends IPowerManager.Stub private void sendNotificationLocked(boolean on, int why) { - if (mProximitySensorActive) { - why = WindowManagerPolicy.OFF_BECAUSE_OF_PROXIMITY_SENSOR; - } if (!on) { mStillNeedSleepNotification = false; } -- cgit v1.1