diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 14:39:43 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 14:39:43 -0400 |
| commit | c2912a662d984e2f23187fa31e7e71122d9472d9 (patch) | |
| tree | 7f037891c5c46216e185be62e307f8f242d9c454 | |
| parent | dfe095a045f132dd9c75da4286b87532d9a973a0 (diff) | |
| parent | c17f07aa0468424e3475d7761313b761372d1860 (diff) | |
| download | frameworks_base-c2912a662d984e2f23187fa31e7e71122d9472d9.zip frameworks_base-c2912a662d984e2f23187fa31e7e71122d9472d9.tar.gz frameworks_base-c2912a662d984e2f23187fa31e7e71122d9472d9.tar.bz2 | |
Merge change 25490 into eclair
* changes:
Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
| -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; } |