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

am 57932798: am db0ec648: Merge change I85572973 into eclair

Browse Source 
Merge commit '57932798cf11d72e656fd6e315b83e2c571cd129' into eclair-mr2-plus-aosp

* commit '57932798cf11d72e656fd6e315b83e2c571cd129':
  Do not show keyguard if screen is turned off by proximity sensor.
This commit is contained in:
Mike Lockwood
2009-12-03 16:32:16 -08:00
committed by Android Git Automerger
parent 5b325098f5 96eac19abd
commit 1738c5f7fa
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
policy/com/android/internal/policy/impl/KeyguardViewMediator.java
View File

@@ -282,8 +282,9 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
/**
* Called to let us know the screen was turned off.
* @param why either {@link WindowManagerPolicy#OFF_BECAUSE_OF_USER} or
* {@link WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT}.
* @param why either {@link WindowManagerPolicy#OFF_BECAUSE_OF_USER},
* {@link WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT} or
* {@link WindowManagerPolicy#OFF_BECAUSE_OF_PROX_SENSOR}.
*/
public void onScreenTurnedOff(int why) {
synchronized (this) {
@@ -314,6 +315,8 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
sender);
if (DEBUG) Log.d(TAG, "setting alarm to turn off keyguard, seq = "
+ mDelayedShowingSequence);
} else if (why == WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR) {
// Do not enable the keyguard if the prox sensor forced the screen off.
} else {
doKeyguard();
}