Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07e7e3f4 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 50c548d2: Disabling user activity now resets user power state so the... 

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

Merge commit '50c548d2' into eclair-mr2

* commit '50c548d2':
  Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
parents 245eaeed 50c548d2

services/java/com/android/server/PowerManagerService.java

+9 −0
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }