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

am 6391830d: Merge change 22958 into eclair

Browse Source 
Merge commit '6391830d103ccb19465c69660065c22c2711dcfd' into eclair-plus-aosp

* commit '6391830d103ccb19465c69660065c22c2711dcfd':
  Don't activate keyguard if screen is turned off while proximity sensor is active.
This commit is contained in:
Mike Lockwood
2009-08-27 14:32:55 -07:00
committed by Android Git Automerger
parent e1ecb7dfe9 6391830d10
commit fb8910f958
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,6 +355,8 @@ 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

@@ -949,6 +949,9 @@ 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;
} }