From 313aa6f58855833f9f45962945dd60a837e64a2f Mon Sep 17 00:00:00 2001
From: Alan Stokes <alanstokes@google.com>
Date: Wed, 7 Jun 2023 10:48:45 +0100
Subject: [PATCH] Capture event log

This test, and the code it is testing, makes use of the event log -
looking for specific info in it, and writing to it.

Make sure we capture the event log during runs of the test so that we
have some chance of diagnosing falures.

Cherry picked I610c7ddd67381d04c35fd42343e21098c150beb5 to master due to b/286408867.

Code was merged via `-s ours` and is missing even though the sha exists on the target branch. Cherry pick is required to bring in the code.

Manually remove the "Merged in" directive to allow for downstream propagation.

Bug: 239817928
Test: N/A
(cherry picked from https://android-review.googlesource.com/q/commit:2f8ca4afb39395458ed806200db7f1b1ba83cbe0)
Change-Id: I6b8c0bfe3bd6141e82ccee910001475b84565a0f
---
 tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml b/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml
index f8a1ec90a78ad..0ab3dfe1ffeeb 100644
--- a/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml
+++ b/tests/DynamicCodeLoggerIntegrationTests/AndroidTest.xml
@@ -22,6 +22,9 @@
     <option name="test-suite-tag" value="apct"/>
     <option name="test-tag" value="DynamicCodeLoggerIntegrationTests"/>
 
+    <!-- This test make uses of the event log, make sure we capture it. -->
+    <option name="logcat-options" value="-b all" />
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.frameworks.dynamiccodeloggertest"/>
         <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/>