joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix testSetOemNetworkPreferenceForTestPref flake" into main am: 8454fb5fed am: f4433fb01e

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

Change-Id: I033ff84dd12192ec0730a1f53c39db8d1f92bced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-09-26 09:38:39 +00:00 • committed by Automerger Merge Worker
commit 284ff33f4a
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View file

@ -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