diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 59aefa5e84ecbe135286d24bc8a715a21144e8df..d2c9481728062f2aa4083fbc1ae72cac4476af87 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -2723,7 +2723,8 @@ public class ConnectivityManagerTest { // the network with the TEST transport. Also wait for validation here, in case there // is a bug that's only visible when the network is validated. setWifiMeteredStatusAndWait(ssid, true /* isMetered */, true /* waitForValidation */); - defaultCallback.expect(CallbackEntry.LOST, wifiNetwork, NETWORK_CALLBACK_TIMEOUT_MS); + defaultCallback.eventuallyExpect(CallbackEntry.LOST, NETWORK_CALLBACK_TIMEOUT_MS, + l -> l.getNetwork().equals(wifiNetwork)); waitForAvailable(defaultCallback, tnt.getNetwork()); // Depending on if this device has cellular connectivity or not, multiple available // callbacks may be received. Eventually, metered Wi-Fi should be the final available