Merge c6b31522bdc59aa050ebfb7e6b794776009c8c60 on remote branch
Change-Id: I4dc93034afd15247c823d4c5a4542689097a7110
diff --git a/test/cts/AndroidTest.xml b/test/cts/AndroidTest.xml
index 3d40593..81d39c3 100644
--- a/test/cts/AndroidTest.xml
+++ b/test/cts/AndroidTest.xml
@@ -17,7 +17,7 @@
<configuration description="Config for CTS Perfetto test cases">
<option name="config-descriptor:metadata" key="component" value="metrics" />
<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
- <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+ <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
<option name="test-suite-tag" value="cts" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
diff --git a/test/cts/heapprofd_java_test_cts.cc b/test/cts/heapprofd_java_test_cts.cc
index e8d4701..bad46b4 100644
--- a/test/cts/heapprofd_java_test_cts.cc
+++ b/test/cts/heapprofd_java_test_cts.cc
@@ -66,7 +66,7 @@
helper.WaitForConsumerConnect();
TraceConfig trace_config;
- trace_config.add_buffers()->set_size_kb(20 * 1024);
+ trace_config.add_buffers()->set_size_kb(40 * 1024);
trace_config.set_duration_ms(6000);
trace_config.set_unique_session_name(RandomSessionName().c_str());