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

Merge "Ensure test network being torn down" into main

Browse Source
This commit is contained in:
Chiachang Wang
2023-08-15 07:21:41 +00:00
committed by Gerrit Code Review
parent ededcdcf88 c9b03fa9ed
commit 29d3ea96f3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cts/net/src/android/net/cts/TestNetworkRunnable.java
View File

@@ -95,14 +95,17 @@ public class TestNetworkRunnable implements ThrowingRunnable {
testIface.getFileDescriptor().close(); testIface.getFileDescriptor().close();
} }
if (tunNetworkCallback != null) {
sCm.unregisterNetworkCallback(tunNetworkCallback);
}
final Network testNetwork = tunNetworkCallback.currentNetwork; final Network testNetwork = tunNetworkCallback.currentNetwork;
if (testNetwork != null) { if (testNetwork != null) {
tnm.teardownTestNetwork(testNetwork); tnm.teardownTestNetwork(testNetwork);
} }
// Ensure test network being torn down.
tunNetworkCallback.waitForLost();
if (tunNetworkCallback != null) {
sCm.unregisterNetworkCallback(tunNetworkCallback);
}
} }
} }