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

Merge commit 'b2346324e5f6062fed7bdeaedb9cf968b05050ec' into eclair-mr2-plus-aosp

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

View File

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