commit 627eb3c63e7c7cb3cb9f8ea319e4bb1676079c3a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 24 20:04:55 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 24 20:04:55 2025 -0700
tree 3efba9c9a6e683130cd2e3424c12b2b070243bc1
parent 9c3aa514365935ea1147a4b0b518090ba7bdf2e0
parent a14524529f779a6a4d6bacc1412b05bf950e07da

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33226827'] into 25Q2-release.

Change-Id: I62b1cb7ffcbfd41f6fc514319fb1fd802911fd8e

tests/cts/multidevices/Android.bp

diff --git a/tests/cts/multidevices/Android.bp b/tests/cts/multidevices/Android.bp
index 00fb934..bf73848 100644
--- a/tests/cts/multidevices/Android.bp
+++ b/tests/cts/multidevices/Android.bp
@@ -21,8 +21,8 @@
     name: "CtsConnectivityMultiDevicesTestCases",
     main: "run_tests.py",
     srcs: [
-        "apfv4_test.py",
-        "apfv6_test.py",
+        // "apfv4_test.py",
+        // "apfv6_test.py",
         "connectivity_multi_devices_test.py",
         "run_tests.py",
     ],

tests/cts/multidevices/run_tests.py

diff --git a/tests/cts/multidevices/run_tests.py b/tests/cts/multidevices/run_tests.py
index a0d0bec..1ac43b9 100644
--- a/tests/cts/multidevices/run_tests.py
+++ b/tests/cts/multidevices/run_tests.py
@@ -15,8 +15,6 @@
 """Main entrypoint for all of test cases."""
 
 import sys
-from apfv4_test import ApfV4Test
-from apfv6_test import ApfV6Test
 from connectivity_multi_devices_test import ConnectivityMultiDevicesTest
 from mobly import suite_runner
 
@@ -36,4 +34,4 @@
     index = sys.argv.index("--")
     sys.argv = sys.argv[:1] + sys.argv[index + 1 :]
   # TODO: make the tests can be executed without manually list classes.
-  suite_runner.run_suite([ConnectivityMultiDevicesTest, ApfV4Test, ApfV6Test], sys.argv)
+  suite_runner.run_suite([ConnectivityMultiDevicesTest], sys.argv)