summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-09-06 13:46:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-06 13:46:18 -0700
commit2949d1af938e4fb0e83f8c524c6e286d5206dc88 (patch)
treec94eccddf32e8a29eca06bcfb8951df7a1950ece /services
parenta94db2467cdc03929c2fc97bf3b451c51a421873 (diff)
parent5e615ee5ad4fb02cec2c328555cf5fb4fc1ea424 (diff)
downloadframeworks_base-2949d1af938e4fb0e83f8c524c6e286d5206dc88.zip
frameworks_base-2949d1af938e4fb0e83f8c524c6e286d5206dc88.tar.gz
frameworks_base-2949d1af938e4fb0e83f8c524c6e286d5206dc88.tar.bz2
am 5e615ee5: am a4796d51: Merge "Fix to show correct duration." into klp-dev
* commit '5e615ee5ad4fb02cec2c328555cf5fb4fc1ea424': Fix to show correct duration.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/am/ProcessStatsService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ProcessStatsService.java b/services/java/com/android/server/am/ProcessStatsService.java
index 55409c2..43ae46f 100644
--- a/services/java/com/android/server/am/ProcessStatsService.java
+++ b/services/java/com/android/server/am/ProcessStatsService.java
@@ -413,6 +413,7 @@ public final class ProcessStatsService extends IProcessStats.Stub {
mWriteLock.lock();
try {
synchronized (mAm) {
+ mProcessStats.mTimePeriodEndRealtime = SystemClock.elapsedRealtime();
mProcessStats.writeToParcel(current, 0);
}
if (historic != null) {