Snap for 8640693 from 5abd19732ba09ab83667a3571b4af9dcd18525e4 to mainline-adservices-release
Change-Id: Id024bf2c255ad51811d7d7597ad0a6e03b7673c7
diff --git a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py b/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py
index 1f80858..1c76401 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py
+++ b/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py
@@ -39,6 +39,7 @@
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
@@ -80,7 +81,9 @@
self.country_code_file)
self.country_code = utils.load_config(
self.country_code_file)["country"]
- wutils.set_wifi_country_code(ad, self.country_code)
+ else:
+ self.country_code = WifiEnums.CountryCode.US
+ 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 d9ed9c0..656bdbe 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):
+def wifi_test_device_init(ad, country_code=WifiEnums.CountryCode.US):
"""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, WifiEnums.CountryCode.US)
+ set_wifi_country_code(ad, country_code)
utils.set_ambient_display(ad, False)
