From 016e39780b857c09ba689ec820a04c7930bd8a7f Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Thu, 17 Sep 2009 11:45:06 -0400 Subject: [PATCH] Revert "Don't activate keyguard if screen is turned off while proximity sensor is active." This reverts commit 4daf9485eca9bab9591bef83dd117cbde1e8beec. --- .../android/internal/policy/impl/KeyguardViewMediator.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java index 2daab27f2f8b8..b1ce74679477e 100644 --- a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -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(); } }