Merge "Remove the requirement of the --checkin flag." into nyc-mr2-dev (1cf89cb8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/DiskStatsService.java

+1 −12

Original line number	Diff line number	Diff line
		@@ -95,9 +95,7 @@ public class DiskStatsService extends Binder {
		pw.println("File-based Encryption: true");
		}

		if (isCheckin(args)) {
		reportCachedValues(pw);
		}

		// TODO: Read /proc/yaffs and report interesting values;
		// add configurable (through args) performance test parameters.
		@@ -130,15 +128,6 @@ public class DiskStatsService extends Binder {
		}
		}

		private boolean isCheckin(String[] args) {
		for (String opt : args) {
		if ("--checkin".equals(opt)) {
		return true;
		}
		}
		return false;
		}

		private void reportCachedValues(PrintWriter pw) {
		try {
		String jsonString = IoUtils.readFileAsString(DISKSTATS_DUMP_FILE);