commit 29d3ea96f3a5f764bc3e3464ee69562796c6f5e1
author Chiachang Wang <chiachangwang@google.com> Tue Aug 15 07:21:41 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 15 07:21:41 2023 +0000
tree 9efa7662201834b9a79874c3d335ade63305a464
parent ededcdcf88e133cc9800275a551fc609e747d04e
parent c9b03fa9ed00c6de1438d579a4e2601f241c70bf

Merge "Ensure test network being torn down" into main

tests/cts/net/src/android/net/cts/TestNetworkRunnable.java

diff --git a/tests/cts/net/src/android/net/cts/TestNetworkRunnable.java b/tests/cts/net/src/android/net/cts/TestNetworkRunnable.java
index 0eb5644..1b22f42 100644
--- a/tests/cts/net/src/android/net/cts/TestNetworkRunnable.java
+++ b/tests/cts/net/src/android/net/cts/TestNetworkRunnable.java
@@ -95,14 +95,17 @@
                 testIface.getFileDescriptor().close();
             }
 
-            if (tunNetworkCallback != null) {
-                sCm.unregisterNetworkCallback(tunNetworkCallback);
-            }
 
             final Network testNetwork = tunNetworkCallback.currentNetwork;
             if (testNetwork != null) {
                 tnm.teardownTestNetwork(testNetwork);
             }
+            // Ensure test network being torn down.
+            tunNetworkCallback.waitForLost();
+
+            if (tunNetworkCallback != null) {
+                sCm.unregisterNetworkCallback(tunNetworkCallback);
+            }
         }
     }