commit b3d8081f76ebcdcd317175bdd6cc0c278bbcf2ab
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Nov 09 00:31:56 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 09 00:31:56 2024 +0000
tree 90725f2541a0177ab2b8e5ed25c197843924122f
parent 54123391a121ebb548d20bbdeaee300377c8b9bf
parent 26fc9a31e3482696cb493456673e350704168c11

Merge "Fix for CtsNetTestCasesUpdateStatsPermission" into android15-tests-dev

staticlibs/testutils/Android.bp

diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp
index 4749e75..9950d44 100644
--- a/staticlibs/testutils/Android.bp
+++ b/staticlibs/testutils/Android.bp
@@ -97,11 +97,7 @@
         "general-tests",
         "cts",
         "mts-networking",
-        "mcts-networking",
         "mts-tethering",
-        "mcts-tethering",
-        "mcts-wifi",
-        "mcts-dnsresolver",
     ],
     data: [":ConnectivityTestPreparer"],
 }

tests/cts/net/AndroidTestTemplate.xml

diff --git a/tests/cts/net/AndroidTestTemplate.xml b/tests/cts/net/AndroidTestTemplate.xml
index 024d3bf..a424b90 100644
--- a/tests/cts/net/AndroidTestTemplate.xml
+++ b/tests/cts/net/AndroidTestTemplate.xml
@@ -19,6 +19,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user_on_secondary_display" />
 
     <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
     <option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk" />