Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c2912a66: Merge change 25490 into eclair

Browse Source 
Merge commit 'c2912a662d984e2f23187fa31e7e71122d9472d9' into eclair-plus-aosp

* commit 'c2912a662d984e2f23187fa31e7e71122d9472d9':
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
This commit is contained in:
Mike Lockwood
2009-09-17 11:45:25 -07:00
committed by Android Git Automerger
parent 7ce29aa8d4 c2912a662d
commit a038decb21
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/WindowManagerPolicy.java
View File

@@ -361,8 +361,6 @@ public interface WindowManagerPolicy {
public final int OFF_BECAUSE_OF_USER = 1; public final int OFF_BECAUSE_OF_USER = 1;
/** Screen turned off because of timeout */ /** Screen turned off because of timeout */
public final int OFF_BECAUSE_OF_TIMEOUT = 2; 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 * Magic constant to {@link IWindowManager#setRotation} to not actually

3
services/java/com/android/server/PowerManagerService.java
View File

@@ -957,9 +957,6 @@ class PowerManagerService extends IPowerManager.Stub
private void sendNotificationLocked(boolean on, int why) private void sendNotificationLocked(boolean on, int why)
{ {
if (mProximitySensorActive) {
why = WindowManagerPolicy.OFF_BECAUSE_OF_PROXIMITY_SENSOR;
}
if (!on) { if (!on) {
mStillNeedSleepNotification = false; mStillNeedSleepNotification = false;
} }