From c6e1493f164d62f7dc99a5a9df6a064c054b219f Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 9 Nov 2009 16:01:37 -0500 Subject: Restore short screen timeout when keyguard is unhidden. This is part of a fix for bug b/2248320 (Lock screen does not time out after 5 seconds, after call-decline) Change-Id: I9ad8cc54fe50d8c9862eec27341fabbd0e871bdd Signed-off-by: Mike Lockwood --- phone/com/android/internal/policy/impl/KeyguardViewMediator.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/phone/com/android/internal/policy/impl/KeyguardViewMediator.java b/phone/com/android/internal/policy/impl/KeyguardViewMediator.java index bfa48ee..f5591b2 100644 --- a/phone/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/phone/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -424,6 +424,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback, * Notify us when the keyguard is hidden by another window */ public void setHidden(boolean isHidden) { + if (DEBUG) Log.d(TAG, "setHidden " + isHidden); synchronized (KeyguardViewMediator.this) { mHidden = isHidden; adjustUserActivityLocked(); @@ -904,7 +905,13 @@ public class KeyguardViewMediator implements KeyguardViewCallback, private void adjustUserActivityLocked() { // disable user activity if we are shown and not hidden - mRealPowerManager.enableUserActivity(!mShowing || mHidden); + if (DEBUG) Log.d(TAG, "adjustUserActivityLocked mShowing: " + mShowing + " mHidden: " + mHidden); + boolean enabled = !mShowing || mHidden; + mRealPowerManager.enableUserActivity(enabled); + if (!enabled && mScreenOn) { + // reinstate our short screen timeout policy + pokeWakelock(); + } } /** -- cgit v1.2.3