Merge "[RTT] Configure APs as part of test initialization" into pi-dev
diff --git a/acts/tests/google/wifi/rtt/functional/RttDisableTest.py b/acts/tests/google/wifi/rtt/functional/RttDisableTest.py
index 3672288..cb8ade3 100644
--- a/acts/tests/google/wifi/rtt/functional/RttDisableTest.py
+++ b/acts/tests/google/wifi/rtt/functional/RttDisableTest.py
@@ -20,9 +20,10 @@
 from acts.test_utils.wifi.rtt import rtt_const as rconsts
 from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
 from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
 
 
-class RttDisableTest(RttBaseTest):
+class RttDisableTest(WifiBaseTest, RttBaseTest):
   """Test class for RTT ranging enable/disable flows."""
 
   MODE_DISABLE_WIFI = 0
@@ -30,7 +31,10 @@
   MODE_DISABLE_LOCATIONING = 2
 
   def __init__(self, controllers):
+    WifiBaseTest.__init__(self, controllers)
     RttBaseTest.__init__(self, controllers)
+    if "AccessPoint" in self.user_params:
+      self.legacy_configure_ap_and_start()
 
   def run_disable_rtt(self, disable_mode):
     """Validate the RTT disabled flows: whether by disabling Wi-Fi or entering