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

am 1305547f: Merge change 22959 into eclair

Browse Source 
Merge commit '1305547fc59120b281609f7d68d8ff21af66df5a'

* commit '1305547fc59120b281609f7d68d8ff21af66df5a':
  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:34:52 -07:00
committed by Android Git Automerger
parent e10cd555bf 7ca3b4277d
commit 05d9a55251
1 changed files with 4 additions and 3 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,8 +273,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_PROXIMITY_SENSOR}.
*/
public void onScreenTurnedOff(int why) {
synchronized (this) {
@@ -305,7 +306,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
sender);
if (DEBUG) Log.d(TAG, "setting alarm to turn off keyguard, seq = "
+ mDelayedShowingSequence);
} else {
} else if (why != WindowManagerPolicy.OFF_BECAUSE_OF_PROXIMITY_SENSOR) {
doKeyguard();
}
}