Merge "Fixup App Compaction CL nits." into qt-dev
diff --git a/services/core/java/com/android/server/am/AppCompactor.java b/services/core/java/com/android/server/am/AppCompactor.java
index 043dc8d..13b55db 100644
--- a/services/core/java/com/android/server/am/AppCompactor.java
+++ b/services/core/java/com/android/server/am/AppCompactor.java
@@ -278,17 +278,15 @@
+ " full, " + mPersistentCompactionCount + " persistent, "
+ mBfgsCompactionCount + " BFGS compactions.");
- if (mLastCompactionStats != null) {
- pw.println(" Tracking last compaction stats for " + mLastCompactionStats.size()
- + " processes.");
- if (DEBUG_COMPACTION) {
- for (Map.Entry<Integer, LastCompactionStats> entry
- : mLastCompactionStats.entrySet()) {
- int pid = entry.getKey();
- LastCompactionStats stats = entry.getValue();
- pw.println(" " + pid + ": "
- + Arrays.toString(stats.getRssAfterCompaction()));
- }
+ pw.println(" Tracking last compaction stats for " + mLastCompactionStats.size()
+ + " processes.");
+ if (DEBUG_COMPACTION) {
+ for (Map.Entry<Integer, LastCompactionStats> entry
+ : mLastCompactionStats.entrySet()) {
+ int pid = entry.getKey();
+ LastCompactionStats stats = entry.getValue();
+ pw.println(" " + pid + ": "
+ + Arrays.toString(stats.getRssAfterCompaction()));
}
}
}
@@ -506,10 +504,6 @@
}
}
- @VisibleForTesting static String procStateListToString(Integer... processStates) {
- return Arrays.toString(processStates);
- }
-
private static final class LastCompactionStats {
private final long[] mRssAfterCompaction;