commit cfc588ea62349813faaec1fc05020ee9286382ed
author Lorenzo Colitti <lorenzo@google.com> Thu Mar 10 14:58:25 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 10 14:58:25 2022 +0000
tree 4a963f84329ba07417a7aae20d140f39b406493c
parent b0fa80dd13cd9f99fc6848d70c9cb677c57f9336
parent 47b89e9594120440367171883a9b5eb3b96b2b30

Merge changes from topic "ethernet-mainline-tm" into tm-dev

* changes:
  Provide a stub ethernet service to build in sc-mainline-prod.
  Build ethernet framework source into framework-connectivity-tiramisu

tests/cts/net/AndroidTestTemplate.xml

diff --git a/tests/cts/net/AndroidTestTemplate.xml b/tests/cts/net/AndroidTestTemplate.xml
index d605799..48a1c79 100644
--- a/tests/cts/net/AndroidTestTemplate.xml
+++ b/tests/cts/net/AndroidTestTemplate.xml
@@ -30,6 +30,8 @@
     </target_preparer>
     <target_preparer class="com.android.testutils.ConnectivityCheckTargetPreparer">
     </target_preparer>
+    <target_preparer class="com.android.testutils.DisableConfigSyncTargetPreparer">
+    </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.net.cts" />
         <option name="runtime-hint" value="9m4s" />