| commit | ddb629663b40a1c0773a8a1734806551518e020c | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Wed Oct 07 00:53:06 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Oct 07 00:53:06 2020 +0000 |
| tree | 9aeac9619c921bbe950054e7e55fba75a0316a1d | |
| parent | d074c9ea585df21b78925f917e03a4278d7c850a [diff] | |
| parent | a1b195ee3fbcaf8283dc021fc6af6531921b7ad3 [diff] |
Merge "Add a test for getCaptivePortalServerUrl"
diff --git a/tests/cts/net/TEST_MAPPING b/tests/cts/net/TEST_MAPPING index 3162e22..9167c98 100644 --- a/tests/cts/net/TEST_MAPPING +++ b/tests/cts/net/TEST_MAPPING
@@ -1,6 +1,6 @@ { // TODO: move to mainline-presubmit once supported - "postsubmit": [ + "presubmit": [ { "name": "CtsNetTestCasesLatestSdk", "options": [
diff --git a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java index 65a8c7c..92dca39 100644 --- a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java +++ b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
@@ -757,7 +757,7 @@ if (!isWifiTetheringSupported(tetherEventCallback)) return; if (previousWifiEnabledState) { - mCtsNetUtils.disconnectFromWifi(null); + mCtsNetUtils.ensureWifiDisconnected(null); } final TestNetworkCallback networkCallback = new TestNetworkCallback();