commit b08d1c3095d98990d12c48e7beaca64693b5be05
author Chalard Jean <jchalard@google.com> Thu Apr 01 08:44:55 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 01 08:44:55 2021 +0000
tree 4825fb0a529bd787d4aa51fe71d824f60629afd0
parent b1cdc09edcbd1b77dc9f86bb54f168f88b3ff6c8
parent 58b8d1eb2200014852d95d7a9ac416c88cc6537c

Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998

Change-Id: I7ab3a57e07a2e48dabb95dd6f671176727d58cdb

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();