Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 07e7e3f4: am 50c548d2: Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.

Browse Source 
Merge commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c' into eclair-mr2-plus-aosp

* commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c':
  Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
This commit is contained in:
Mike Lockwood
2009-11-10 07:19:48 -08:00
committed by Android Git Automerger
parent 16182e74c8 07e7e3f4be
commit 260fdc776b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/PowerManagerService.java
View File

@@ -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 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) { public void enableUserActivity(boolean enabled) {
if (mSpew) {
Log.d(TAG, "enableUserActivity " + enabled);
}
synchronized (mLocks) { synchronized (mLocks) {
mUserActivityAllowed = enabled; mUserActivityAllowed = enabled;
if (!enabled) {
// cancel timeout and clear mUserState so the keyguard can set a short timeout
setTimeoutLocked(SystemClock.uptimeMillis(), 0);
}
} }
} }