| commit | 521435ad3830a84c7efb5497c3ba5ba050eaf21c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Dec 05 09:49:40 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 05 09:49:40 2024 +0000 |
| tree | 8b62f25e2018a3080a04f0e3f507bedd67a943d0 | |
| parent | c500e085f2d834ff177a77ce2779ab450bef25ec [diff] | |
| parent | 1a3a3706bab7444e1688ebf558cd919f48300200 [diff] |
Merge "Reconnect to wifi if supported" into main am: bd579b4658 am: 1a3a3706ba Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3235063 Change-Id: Id0360540ff57581b27f933b16a8baa639525c7a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/testutils/host/python/tether_utils.py b/staticlibs/testutils/host/python/tether_utils.py index 702b596..c63de1f 100644 --- a/staticlibs/testutils/host/python/tether_utils.py +++ b/staticlibs/testutils/host/python/tether_utils.py
@@ -108,3 +108,6 @@ server.unregisterAll() # Teardown the hotspot. server.stopAllTethering() + # Some test cases would disable wifi, e.g. cellular upstream tests. + # Reconnect to it if feasible. + server.reconnectWifiIfSupported()
diff --git a/tests/cts/multidevices/snippet/ConnectivityMultiDevicesSnippet.kt b/tests/cts/multidevices/snippet/ConnectivityMultiDevicesSnippet.kt index 49688cc..6da7e9a 100644 --- a/tests/cts/multidevices/snippet/ConnectivityMultiDevicesSnippet.kt +++ b/tests/cts/multidevices/snippet/ConnectivityMultiDevicesSnippet.kt
@@ -89,6 +89,11 @@ ctsNetUtils.expectNetworkIsSystemDefault(network) } + @Rpc(description = "Reconnect to wifi if supported.") + fun reconnectWifiIfSupported() { + ctsNetUtils.reconnectWifiIfSupported() + } + @Rpc(description = "Unregister all connections.") fun unregisterAll() { cbHelper.unregisterAll()