commit fb4ab74a097284b932967800820ba8c73703b2fb
author Maciej Żenczykowski <maze@google.com> Sat May 06 14:26:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 06 14:26:57 2023 +0000
tree cbcfc3ea64c9e9f3dbf1732d81216c9f1c468ea5
parent e95ec4afa7fa47ac9fe38fbf7c6b316e461055c5
parent 79c9aa8ecc9f4dd70ad05d2f7b8e5eadd527ca3d

Merge "ConnectivityManagerTest: clean up when connectToCell fails"

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()));