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

Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."

Browse Source 
This reverts commit 4daf9485eca9bab9591bef83dd117cbde1e8beec.
This commit is contained in:
Mike Lockwood
2009-09-17 11:45:06 -04:00
parent cfe3e90b30
commit 016e39780b
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();
}
}