LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix testTetheringUpstream flaky"

Browse Source
This commit is contained in:
Treehugger Robot
2020-05-28 01:36:55 +00:00
committed by Gerrit Code Review
parent 06c7ebc8e4 47e3788e3e
commit 555ca8801b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
View File

@@ -56,6 +56,7 @@ import android.net.TetheringManager.TetheringEventCallback;
import android.net.TetheringManager.TetheringInterfaceRegexps; import android.net.TetheringManager.TetheringInterfaceRegexps;
import android.net.TetheringManager.TetheringRequest; import android.net.TetheringManager.TetheringRequest;
import android.net.cts.util.CtsNetUtils; import android.net.cts.util.CtsNetUtils;
import android.net.cts.util.CtsNetUtils.TestNetworkCallback;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.PersistableBundle; import android.os.PersistableBundle;
@@ -714,7 +715,15 @@ public class TetheringManagerTest {
mCtsNetUtils.disconnectFromWifi(null); mCtsNetUtils.disconnectFromWifi(null);
} }
final Network activeNetwork = mCm.getActiveNetwork(); final TestNetworkCallback networkCallback = new TestNetworkCallback();
Network activeNetwork = null;
try {
mCm.registerDefaultNetworkCallback(networkCallback);
activeNetwork = networkCallback.waitForAvailable();
} finally {
mCm.unregisterNetworkCallback(networkCallback);
}
assertNotNull("No active network. Please ensure the device has working mobile data.", assertNotNull("No active network. Please ensure the device has working mobile data.",
activeNetwork); activeNetwork);
final NetworkCapabilities activeNetCap = mCm.getNetworkCapabilities(activeNetwork); final NetworkCapabilities activeNetCap = mCm.getNetworkCapabilities(activeNetwork);