Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d0057ed authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c am: e9657209 am: b139c0e7 

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

Change-Id: Ib3ec17315225e4f0ed173d4d17165b8f21e07acb
parents 530356c5 b139c0e7

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

+1 −1
Original line number Diff line number Diff line
@@ -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();