diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-30 18:12:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-30 18:12:24 -0700 |
| commit | ab2e6284845794079d809e62c52c6c380b31c4b5 (patch) | |
| tree | 067c52d45d3d060d8c012be7c88bf09977e07147 /services | |
| parent | 8b28441adab59f2bb0d92c8a717af75331249e08 (diff) | |
| parent | a39ccb6c4ae7dbf522a3fd0c450a95653c6418ea (diff) | |
| download | frameworks_base-ab2e6284845794079d809e62c52c6c380b31c4b5.zip frameworks_base-ab2e6284845794079d809e62c52c6c380b31c4b5.tar.gz frameworks_base-ab2e6284845794079d809e62c52c6c380b31c4b5.tar.bz2 | |
Merge "Use the private version of userActivity." into gingerbread
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 71105f1..e77ed69 100644 --- 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); } |