Merge changes from topic "connectivity-cts-cherrypicks" into sc-dev am: 77fb999ed0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15057280

Change-Id: I197cb49c4f4515fd652ee1056120abf01088ed56
This commit is contained in:
Lorenzo Colitti
2021-06-22 23:29:53 +00:00
committed by Automerger Merge Worker

View File

@@ -760,7 +760,7 @@ public class VpnTest extends InstrumentationTestCase {
assertEquals(vpnNetwork, mCM.getActiveNetwork());
assertNotEqual(defaultNetwork, vpnNetwork);
maybeExpectVpnTransportInfo(vpnNetwork);
assertTrue(mCM.getNetworkInfo(vpnNetwork).getType() == TYPE_VPN);
assertEquals(TYPE_VPN, mCM.getNetworkInfo(vpnNetwork).getType());
if (SdkLevel.isAtLeastS()) {
// Check that system default network callback has not seen any network changes, even