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

am fa883071: Merge "Fix issue #11175600: Proc stats is aggregating stats in the wrong direction" into klp-dev

Browse Source 
* commit 'fa8830715ddd6e9ffdf833799580521b5eb530ac':
  Fix issue #11175600: Proc stats is aggregating stats in the wrong direction
This commit is contained in:
Dianne Hackborn
2013-10-10 18:33:01 -07:00
committed by Android Git Automerger
parent 6f090af305 fa8830715d
commit 0faf411fb4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/am/ProcessStatsService.java
View File

@@ -473,11 +473,11 @@ public final class ProcessStatsService extends IProcessStats.Stub {
current.setDataPosition(0);
ProcessStats stats = ProcessStats.CREATOR.createFromParcel(current);
current.recycle();
int i = 0;
while (i < files.size() && (stats.mTimePeriodEndRealtime
int i = files.size()-1;
while (i >= 0 && (stats.mTimePeriodEndRealtime
- stats.mTimePeriodStartRealtime) < minTime) {
AtomicFile file = new AtomicFile(new File(files.get(i)));
i++;
i--;
ProcessStats moreStats = new ProcessStats(false);
readLocked(moreStats, file);
if (moreStats.mReadError == null) {
@@ -490,7 +490,7 @@ public final class ProcessStatsService extends IProcessStats.Stub {
- moreStats.mTimePeriodStartRealtime, sb);
Slog.i(TAG, sb.toString());
} else {
Slog.w(TAG, "Failure reading " + files.get(i-1) + "; "
Slog.w(TAG, "Failure reading " + files.get(i+1) + "; "
+ moreStats.mReadError);
continue;
}