commit 00acd733e29f0e1420f29fec1e3efee13bb39c94
author Julien Desprez <jdesprez@google.com> Tue Aug 14 10:34:09 2018 -0700
committer Brett Chabot <brettchabot@google.com> Tue Jan 29 10:43:02 2019 -0800
tree 7fd4bca380882aedb5941057fa5e0b3ea8a63154
parent 39130aaa23ad4d22b5519d55d7d35cf5cd9f4e49

Manifest has several instrumentation, avoid the conflict

Explicitly specify the instrumentation runner to avoid
the wrong runner being used.

Test: atest android.content.cts.ContextTest -v
Merged-In: Ice3e45c1e4d0c2c8fa6ca2e761b38a2a0f555f1f
(cherry pick from master)

Change-Id: I7c5ce8c16f721c46bd1b93b9126d3fb173222644

tests/tests/content/AndroidTest.xml

diff --git a/tests/tests/content/AndroidTest.xml b/tests/tests/content/AndroidTest.xml
index 58305dd..4b22631 100644
--- a/tests/tests/content/AndroidTest.xml
+++ b/tests/tests/content/AndroidTest.xml
@@ -35,6 +35,7 @@
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
         <option name="package" value="android.content.cts" />
         <option name="runtime-hint" value="21m30s" />
         <option name="hidden-api-checks" value="false" />