From 33303d76ccf78b3c7f690b1bb18f5bae73821dd3 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Thu, 27 Aug 2009 13:27:51 -0700 Subject: [PATCH] Don't activate keyguard if screen is turned off while proximity sensor is active. Signed-off-by: Mike Lockwood --- .../android/internal/policy/impl/KeyguardViewMediator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java index b1ce74679477e..2daab27f2f8b8 100644 --- a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -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(); } }