am f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.

Merge commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-mr2

* commit 'f1d14f6a33bc6086db52a77b6a1217452b7eac90':
  Do not advance mLastEventTime when enabling or disabling user activity.
This commit is contained in:
Mike Lockwood
2009-11-02 10:11:17 -08:00
committed by Android Git Automerger

View File

@@ -2079,7 +2079,6 @@ class PowerManagerService extends IPowerManager.Stub
public void enableUserActivity(boolean enabled) { public void enableUserActivity(boolean enabled) {
synchronized (mLocks) { synchronized (mLocks) {
mUserActivityAllowed = enabled; mUserActivityAllowed = enabled;
mLastEventTime = SystemClock.uptimeMillis(); // we might need to pass this in
} }
} }