summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chalard Jean <jchalard@google.com> 2021-04-01 08:19:53 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-04-01 08:19:53 +0000
commit7151f51c5ae46ad081c78e5d0ac1b4700bbcf2bc (patch)
treec212dc607fceb6aca6439788f2946b002c291c3f
parent39e56169aa43c16623a267627ac4cd6232927bd7 (diff)
parentea4d25a7504466362317d99deb9d9b20014e2e69 (diff)
Merge "Fix testLegacyLockdownVpn flaky"
-rw-r--r--tests/net/java/com/android/server/ConnectivityServiceTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 14c72f1445a9..ad934204c4bd 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -8133,12 +8133,12 @@ public class ConnectivityServiceTest {
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();