Merge "[ACTS]Fix WiFiAutoUpdateTest updated failed from Android R to Android R" into rvc-dev am: 9716849f3c am: 1ed229c73c
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/connectivity/+/12696984
Change-Id: Ib0ae022242a6d9304b7e109f433f54de21c2bf10
diff --git a/acts/tests/google/wifi/WifiAutoUpdateTest.py b/acts/tests/google/wifi/WifiAutoUpdateTest.py
index 8e20c81..4ce81d9 100755
--- a/acts/tests/google/wifi/WifiAutoUpdateTest.py
+++ b/acts/tests/google/wifi/WifiAutoUpdateTest.py
@@ -126,7 +126,18 @@
self.wifi_hotspot = {"SSID": "hotspot_%s" % utils.rand_ascii_str(6),
"password": "pass_%s" % utils.rand_ascii_str(6)}
band = WIFI_CONFIG_APBAND_5G
- if self.dut.build_info["build_id"].startswith("Q"):
+ if self.dut.build_info["build_id"].startswith("R"):
+ band = WifiEnums.WIFI_CONFIG_SOFTAP_BAND_5G
+ self.wifi_hotspot[WifiEnums.AP_BAND_KEY] = band
+ asserts.assert_true(
+ self.dut.droid.wifiSetWifiApConfiguration(self.wifi_hotspot),
+ "Failed to set WifiAp Configuration")
+ wifi_ap = self.dut.droid.wifiGetApConfiguration()
+ asserts.assert_true(
+ wifi_ap[WifiEnums.SSID_KEY] == self.wifi_hotspot[WifiEnums.SSID_KEY],
+ "Hotspot SSID doesn't match with expected SSID")
+ return
+ elif self.dut.build_info["build_id"].startswith("Q"):
band = WifiEnums.WIFI_CONFIG_APBAND_5G_OLD
self.wifi_hotspot[WifiEnums.AP_BAND_KEY] = band
asserts.assert_true(
