Snap for 8721632 from 5e04e4e97b69446fc9776d8d214faf0aae9fb759 to mainline-adservices-release
Change-Id: I29453b3e9c7fe1fcedacd5c36dc1bc3fabff7da7
diff --git a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py b/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py
index 1c76401..1f80858 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py
+++ b/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py
@@ -39,7 +39,6 @@
from acts_contrib.test_utils.net import net_test_utils as nutils
from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-WifiEnums = wutils.WifiEnums
AP_1 = 0
AP_2 = 1
MAX_AP_COUNT = 2
@@ -81,9 +80,7 @@
self.country_code_file)
self.country_code = utils.load_config(
self.country_code_file)["country"]
- else:
- self.country_code = WifiEnums.CountryCode.US
- wutils.set_wifi_country_code(ad, self.country_code)
+ wutils.set_wifi_country_code(ad, self.country_code)
def setup_test(self):
if (hasattr(self, "android_devices")
diff --git a/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py b/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py
index 656bdbe..d9ed9c0 100755
--- a/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py
+++ b/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py
@@ -811,7 +811,7 @@
break
-def wifi_test_device_init(ad, country_code=WifiEnums.CountryCode.US):
+def wifi_test_device_init(ad):
"""Initializes an android device for wifi testing.
0. Make sure SL4A connection is established on the android device.
@@ -842,7 +842,7 @@
ad.log.info("wpa_supplicant log change status: %s", output)
utils.sync_device_time(ad)
ad.droid.telephonyToggleDataConnection(False)
- set_wifi_country_code(ad, country_code)
+ set_wifi_country_code(ad, WifiEnums.CountryCode.US)
utils.set_ambient_display(ad, False)
