From 50c548d242d637328ec6b2c4987969b02695cc7d Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 9 Nov 2009 16:02:06 -0500 Subject: [PATCH] Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden. This is part of a fix for bug b/2248320 (Lock screen does not time out after Change-Id: Iba7f8a7b9997ecb0e4da37667600055f9a35531c Signed-off-by: Mike Lockwood --- .../java/com/android/server/PowerManagerService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index dd4a630a828f2..3000e9d4e4ee3 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2106,10 +2106,19 @@ class PowerManagerService extends IPowerManager.Stub /** * When the keyguard is up, it manages the power state, and userActivity doesn't do anything. + * When disabling user activity we also reset user power state so the keyguard can reset its + * short screen timeout when keyguard is unhidden. */ public void enableUserActivity(boolean enabled) { + if (mSpew) { + Log.d(TAG, "enableUserActivity " + enabled); + } synchronized (mLocks) { mUserActivityAllowed = enabled; + if (!enabled) { + // cancel timeout and clear mUserState so the keyguard can set a short timeout + setTimeoutLocked(SystemClock.uptimeMillis(), 0); + } } }