Merge "Adds an option to disable capture logcat in proto file" into main
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java
index d79131c..3b16cab 100644
--- a/cmds/am/src/com/android/commands/am/Am.java
+++ b/cmds/am/src/com/android/commands/am/Am.java
@@ -183,6 +183,8 @@
instrument.disableTestApiChecks = false;
} else if (opt.equals("--no-isolated-storage")) {
instrument.disableIsolatedStorage = true;
+ } else if (opt.equals("--no-logcat")) {
+ instrument.captureLogcat = false;
} else if (opt.equals("--user")) {
instrument.userId = parseUserArg(nextArgRequired());
} else if (opt.equals("--abi")) {
diff --git a/cmds/am/src/com/android/commands/am/Instrument.java b/cmds/am/src/com/android/commands/am/Instrument.java
index e60593e..e0d949e 100644
--- a/cmds/am/src/com/android/commands/am/Instrument.java
+++ b/cmds/am/src/com/android/commands/am/Instrument.java
@@ -85,6 +85,7 @@
public String profileFile = null;
public boolean wait = false;
public boolean rawMode = false;
+ public boolean captureLogcat = true;
boolean protoStd = false; // write proto to stdout
boolean protoFile = false; // write proto to a file
String logPath = null;
@@ -266,16 +267,18 @@
proto.write(InstrumentationData.TestStatus.RESULT_CODE, resultCode);
writeBundle(proto, InstrumentationData.TestStatus.RESULTS, results);
- if (resultCode == STATUS_TEST_STARTED) {
- // Logcat -T takes wall clock time (!?)
- mTestStartMs = System.currentTimeMillis();
- } else {
- if (mTestStartMs > 0) {
- proto.write(InstrumentationData.TestStatus.LOGCAT, readLogcat(mTestStartMs));
+ if (captureLogcat) {
+ if (resultCode == STATUS_TEST_STARTED) {
+ // Logcat -T takes wall clock time (!?)
+ mTestStartMs = System.currentTimeMillis();
+ } else {
+ if (mTestStartMs > 0) {
+ proto.write(InstrumentationData.TestStatus.LOGCAT,
+ readLogcat(mTestStartMs));
+ }
+ mTestStartMs = 0;
}
- mTestStartMs = 0;
}
-
proto.end(testStatusToken);
outputProto(proto);