Commit b2346324 authored Nov 02, 2009 by Mike Lockwood Committed by Android Git Automerger Nov 02, 2009

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

Merge commit 'f1d14f6a' into eclair-mr2

* commit 'f1d14f6a':
  Do not advance mLastEventTime when enabling or disabling user activity.

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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
		}
		}