summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Makoto Onuki <omakoto@google.com> 2017-02-07 17:11:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-02-07 17:11:45 +0000
commitf34f9736a91e074a7f75aa71b4bb0250f921e36b (patch)
treee1117d8630bd9660a416a051ddf13940d3e65ca4
parent3f7bf2e96c4d7a5350e258d392d063de7705356f (diff)
parent34a6e844565494e4c7742a54ec6ef20475637c5e (diff)
Merge "Fix PSS/USS Average in procstats"
-rw-r--r--core/java/com/android/internal/app/procstats/PssTable.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/procstats/PssTable.java b/core/java/com/android/internal/app/procstats/PssTable.java
index b6df983d2ac8..de5f67330423 100644
--- a/core/java/com/android/internal/app/procstats/PssTable.java
+++ b/core/java/com/android/internal/app/procstats/PssTable.java
@@ -96,7 +96,7 @@ public class PssTable extends SparseMappingTable.Table {
}
val = getValue(key, PSS_USS_AVERAGE);
- setValue(key, PSS_AVERAGE,
+ setValue(key, PSS_USS_AVERAGE,
(long)(((val*(double)count)+(avgUss*(double)inCount)) / (count+inCount)));
val = getValue(key, PSS_USS_MAXIMUM);