commit 7151f51c5ae46ad081c78e5d0ac1b4700bbcf2bc
author Chalard Jean <jchalard@google.com> Thu Apr 01 08:19:53 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 01 08:19:53 2021 +0000
tree c212dc607fceb6aca6439788f2946b002c291c3f
parent 39e56169aa43c16623a267627ac4cd6232927bd7
parent ea4d25a7504466362317d99deb9d9b20014e2e69

Merge "Fix testLegacyLockdownVpn flaky"

tests/net/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 14c72f1..ad93420 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -8133,12 +8133,12 @@
         assertExtraInfoFromCmPresent(mWiFiNetworkAgent);
 
         b1 = expectConnectivityAction(TYPE_WIFI, DetailedState.DISCONNECTED);
+        b2 = expectConnectivityAction(TYPE_VPN, DetailedState.DISCONNECTED);
         mWiFiNetworkAgent.disconnect();
         callback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent);
         systemDefaultCallback.expectCallback(CallbackEntry.LOST, mWiFiNetworkAgent);
         b1.expectBroadcast();
         callback.expectCapabilitiesThat(mMockVpn, nc -> !nc.hasTransport(TRANSPORT_WIFI));
-        b2 = expectConnectivityAction(TYPE_VPN, DetailedState.DISCONNECTED);
         mMockVpn.expectStopVpnRunnerPrivileged();
         callback.expectCallback(CallbackEntry.LOST, mMockVpn);
         b2.expectBroadcast();