diff options
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index dd4a630..3000e9d 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); + } } } |