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

am 23d153cf: Revert "Don\'t activate keyguard if screen is turned off while proximity sensor is active."

Browse Source 
Merge commit '23d153cf0d17762cee81984b7adf2009a40dc5c6'

* commit '23d153cf0d17762cee81984b7adf2009a40dc5c6':
  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 12:19:13 -07:00
committed by Android Git Automerger
parent 048fbf4b97 016e39780b
commit 22b89ccc27
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,9 +273,8 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
/**
* Called to let us know the screen was turned off.
* @param why either {@link WindowManagerPolicy#OFF_BECAUSE_OF_USER},
* {@link WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT} or
* {@link WindowManagerPolicy#OFF_BECAUSE_OF_PROXIMITY_SENSOR}.
* @param why either {@link WindowManagerPolicy#OFF_BECAUSE_OF_USER} or
* {@link WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT}.
*/
public void onScreenTurnedOff(int why) {
synchronized (this) {
@@ -306,7 +305,7 @@ 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_PROXIMITY_SENSOR) {
} else {
doKeyguard();
}
}