From 9bca06aa43fdeb7bbfeeb40d1f2daf772358a143 Mon Sep 17 00:00:00 2001
From: Yuyang Huang <yuyanghuang@google.com>
Date: Thu, 24 Apr 2025 03:02:15 -0700
Subject: [PATCH] Revert "Completely disable flaky APF multidevice CTS class"

This reverts commit 5d3dc48289e39ed39401f5bdc67dffda9deba370.

Reason for revert: target for 25Q4

Bug: 406570694
Change-Id: I124d7bcb2a09cab2d825042814adb262fd2e50cf
---
 tests/cts/multidevices/Android.bp   | 4 ++--
 tests/cts/multidevices/run_tests.py | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/cts/multidevices/Android.bp b/tests/cts/multidevices/Android.bp
index bf73848b93..00fb93409c 100644
--- a/tests/cts/multidevices/Android.bp
+++ b/tests/cts/multidevices/Android.bp
@@ -21,8 +21,8 @@ python_test_host {
     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",
     ],
diff --git a/tests/cts/multidevices/run_tests.py b/tests/cts/multidevices/run_tests.py
index 1ac43b9ab9..a0d0bec587 100644
--- a/tests/cts/multidevices/run_tests.py
+++ b/tests/cts/multidevices/run_tests.py
@@ -15,6 +15,8 @@
 """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
 
@@ -34,4 +36,4 @@ if __name__ == "__main__":
     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], sys.argv)
+  suite_runner.run_suite([ConnectivityMultiDevicesTest, ApfV4Test, ApfV6Test], sys.argv)