Merge "Remove the requirement of the --checkin flag. am: ed371cb035 am: eb1bb3b3a6"

This commit is contained in:
Android Build Merger (Role)
2017-01-19 00:55:28 +00:00
committed by Android (Google) Code Review

View File

@@ -95,9 +95,7 @@ public class DiskStatsService extends Binder {
pw.println("File-based Encryption: true");
}
if (isCheckin(args)) {
reportCachedValues(pw);
}
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);