Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joe Onorato
2010-09-30 18:12:24 -07:00
committed by Android (Google) Code Review
parent 8b28441ada a39ccb6c4a
commit ab2e628484
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/PowerManagerService.java
View File

@@ -871,7 +871,7 @@ class PowerManagerService extends IPowerManager.Stub
mWakeLockState = mLocks.gatherState(); mWakeLockState = mLocks.gatherState();
// goes in the middle to reduce flicker // goes in the middle to reduce flicker
if ((wl.flags & PowerManager.ON_AFTER_RELEASE) != 0) { if ((wl.flags & PowerManager.ON_AFTER_RELEASE) != 0) {
userActivity(SystemClock.uptimeMillis(), false); userActivity(SystemClock.uptimeMillis(), -1, false, OTHER_EVENT, false);
} }
setPowerState(mWakeLockState | mUserState); setPowerState(mWakeLockState | mUserState);
} }