commit f34f9736a91e074a7f75aa71b4bb0250f921e36b
author Makoto Onuki <omakoto@google.com> Tue Feb 07 17:11:41 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 07 17:11:45 2017 +0000
tree e1117d8630bd9660a416a051ddf13940d3e65ca4
parent 3f7bf2e96c4d7a5350e258d392d063de7705356f
parent 34a6e844565494e4c7742a54ec6ef20475637c5e

Merge "Fix PSS/USS Average in procstats"

core/java/com/android/internal/app/procstats/PssTable.java

diff --git a/core/java/com/android/internal/app/procstats/PssTable.java b/core/java/com/android/internal/app/procstats/PssTable.java
index b6df983..de5f673 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 @@
             }
 
             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);