aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Hair <allenhair@google.com>2016-06-29 11:15:21 -0700
committerAllen Hair <allenhair@google.com>2016-06-29 11:15:21 -0700
commit6d4519ee213c86ad9f3987e557f7787920a03714 (patch)
treeb89dec054ade63a429289b10ac987be3f8345f2e
parent831c25634045d80f5cd522f934af6f9dfd253e62 (diff)
downloadjacoco-6d4519ee213c86ad9f3987e557f7787920a03714.tar.gz
Change default OutputMode to none.
Bug: 29869799 Change-Id: I6b2f58ec8b9d49cda73fe59a4e6a40df84a877b5
-rw-r--r--README.android1
-rw-r--r--org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java5
2 files changed, 5 insertions, 1 deletions
diff --git a/README.android b/README.android
index 6df57d1a..cad30c6c 100644
--- a/README.android
+++ b/README.android
@@ -13,3 +13,4 @@ compilation. The changes are surrounded by "BEGIN android-change" and "END andro
is the list of the changes:
1) Remove the creation of JmxRegistration in org.jacoco.agent.rt.internal.Agent.
+2) Change default OutputMode to none in org.jacoco.core.runtime.AgentOptions
diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java b/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java
index 04f91c4c..c5be0a07 100644
--- a/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java
+++ b/org.jacoco.core/src/org/jacoco/core/runtime/AgentOptions.java
@@ -460,7 +460,10 @@ public final class AgentOptions {
*/
public OutputMode getOutput() {
final String value = options.get(OUTPUT);
- return value == null ? OutputMode.file : OutputMode.valueOf(value);
+// BEGIN android-change
+// return value == null ? OutputMode.file : OutputMode.valueOf(value);
+ return value == null ? OutputMode.none : OutputMode.valueOf(value);
+// END android-change
}
/**