Merge "Use the private version of userActivity." into gingerbread

2010-09-30 18:12:24 -07:00
parent 8b28441ada a39ccb6c4a
commit ab2e628484
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -871,7 +871,7 @@ class PowerManagerService extends IPowerManager.Stub
            mWakeLockState = mLocks.gatherState();
            // goes in the middle to reduce flicker
            if ((wl.flags & PowerManager.ON_AFTER_RELEASE) != 0) {
-                userActivity(SystemClock.uptimeMillis(), false);
+                userActivity(SystemClock.uptimeMillis(), -1, false, OTHER_EVENT, false);
            }
            setPowerState(mWakeLockState | mUserState);
        }