joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22 am: b08d1c3095

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

Change-Id: If5e7a4038b58b3beb52c517cfa1208cf08fcac2a
This commit is contained in:
Chalard Jean 2021-04-01 09:22:48 +00:00 • committed by Automerger Merge Worker
commit 4ac82f64c9
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/net/java/com/android/server/ConnectivityServiceTest.java
View file

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