commit f56f4a2794a8793d13e2796d5c89c8179032ed43
author Omar El Ayach <oelayach@google.com> Wed Mar 23 18:01:10 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 23 18:01:10 2022 +0000
tree 95786db1b6d8052ab880eb33127ba261e3851f40
parent a42c678532086896b4b3557754e6f38cc3a1013a
parent 6df23e41b9d54fb1b3c6204ce2c22a9072328759

Merge "Revert "Skip gateway check on old version""

acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py

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 3c5d2d5..3da5483 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
@@ -2042,12 +2042,11 @@
     Returns:
         ping output if successful, NULL otherwise.
     """
-    android_version = ad.adb.shell("getprop ro.vendor.build.version.release")
     # wait_time to allow for DHCP to complete.
     for i in range(wait_time):
-        if ad.droid.connectivityNetworkIsConnected():
-            if (android_version > 10 and ad.droid.connectivityGetIPv4DefaultGateway()) or android_version < 11:
-                break
+        if ad.droid.connectivityNetworkIsConnected(
+        ) and ad.droid.connectivityGetIPv4DefaultGateway():
+            break
         time.sleep(1)
     ping = False
     try:
@@ -2055,7 +2054,7 @@
         ad.log.info("Http ping result: %s.", ping)
     except:
         pass
-    if android_version > 10 and not ping and ping_gateway:
+    if not ping and ping_gateway:
         ad.log.info("Http ping failed. Pinging default gateway")
         gw = ad.droid.connectivityGetIPv4DefaultGateway()
         result = ad.adb.shell("ping -c 6 {}".format(gw))