diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-09-17 11:47:56 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2009-09-17 11:58:01 -0400 |
| commit | c17f07aa0468424e3475d7761313b761372d1860 (patch) | |
| tree | 558bd3ca293a19fa96ec215c62d48758a1d1fa0b | |
| parent | c7aef5d0fda58a1685e5584b34e1b80ba016f017 (diff) | |
| download | frameworks_base-c17f07aa0468424e3475d7761313b761372d1860.zip frameworks_base-c17f07aa0468424e3475d7761313b761372d1860.tar.gz frameworks_base-c17f07aa0468424e3475d7761313b761372d1860.tar.bz2 | |
Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
This reverts commit ddfe879b783ad72603308e28e8f683454464684e.
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 3 |
2 files changed, 0 insertions, 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; } |