diff options
| author | Chalard Jean <jchalard@google.com> | 2021-04-01 10:10:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-01 10:10:39 +0000 |
| commit | 9d0057edb681edc33cd5bde653791af3b87f50b5 (patch) | |
| tree | 64a23ac93d46e7563df67d96e039acca877634ab /tests/net/java/com/android/server/ConnectivityServiceTest.java | |
| parent | 530356c5bc8205968ae0f5dd1826bcdb4d9196bc (diff) | |
| parent | b139c0e716134b5b16c185f8795746afa0aee86b (diff) | |
Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a am: e965720924 am: b139c0e716
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998
Change-Id: Ib3ec17315225e4f0ed173d4d17165b8f21e07acb
Diffstat (limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java')
| -rw-r--r-- | tests/net/java/com/android/server/ConnectivityServiceTest.java | 2 |
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 154e6f882121..b15d25250d4d 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -8234,12 +8234,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(); |