commit b1818d0920b339eb20cb6915c99232492a866238
author Maciej Żenczykowski <maze@google.com> Sat May 06 14:52:09 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 06 14:52:09 2023 +0000
tree da675992a5bbcb7133bfee3993dee99c47557132
parent 28d6bc8431879f1177309e606ade285d0a2cb9ec
parent fb4ab74a097284b932967800820ba8c73703b2fb

Merge "ConnectivityManagerTest: clean up when connectToCell fails" am: fb4ab74a09

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2577840

Change-Id: Iee1ba6b6a38a1dfa96b04b0e467ddc92ed3db506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 423b2bd..4cc5276 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2960,13 +2960,13 @@
 
         allowBadWifi();
 
-        final Network cellNetwork = mCtsNetUtils.connectToCell();
-        final Network wifiNetwork = prepareValidatedNetwork();
-
-        registerDefaultNetworkCallback(defaultCb);
-        registerNetworkCallback(makeWifiNetworkRequest(), wifiCb);
-
         try {
+            final Network cellNetwork = mCtsNetUtils.connectToCell();
+            final Network wifiNetwork = prepareValidatedNetwork();
+
+            registerDefaultNetworkCallback(defaultCb);
+            registerNetworkCallback(makeWifiNetworkRequest(), wifiCb);
+
             // Verify wifi is the default network.
             defaultCb.eventuallyExpect(CallbackEntry.AVAILABLE, NETWORK_CALLBACK_TIMEOUT_MS,
                     entry -> wifiNetwork.equals(entry.getNetwork()));