LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add a test to check if the VPN type is set or not" into sc-dev am: 013cf220f0

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

Change-Id: I3988e8d3df6819e5ef233e8c235488a17131f1b3
This commit is contained in:
Lucas Lin
2021-06-18 03:02:06 +00:00
committed by Automerger Merge Worker
parent 93c4f4cc2d 013cf220f0
commit 7d409ae0c5
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
View File

@@ -17,6 +17,7 @@
package com.android.cts.net.hostside; package com.android.cts.net.hostside;
import static android.Manifest.permission.NETWORK_SETTINGS; import static android.Manifest.permission.NETWORK_SETTINGS;
import static android.net.ConnectivityManager.TYPE_VPN;
import static android.net.NetworkCapabilities.TRANSPORT_VPN; import static android.net.NetworkCapabilities.TRANSPORT_VPN;
import static android.os.Process.INVALID_UID; import static android.os.Process.INVALID_UID;
import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.AF_INET;
@@ -759,6 +760,7 @@ public class VpnTest extends InstrumentationTestCase {
assertEquals(vpnNetwork, mCM.getActiveNetwork()); assertEquals(vpnNetwork, mCM.getActiveNetwork());
assertNotEqual(defaultNetwork, vpnNetwork); assertNotEqual(defaultNetwork, vpnNetwork);
maybeExpectVpnTransportInfo(vpnNetwork); maybeExpectVpnTransportInfo(vpnNetwork);
assertTrue(mCM.getNetworkInfo(vpnNetwork).getType() == TYPE_VPN);
if (SdkLevel.isAtLeastS()) { if (SdkLevel.isAtLeastS()) {
// Check that system default network callback has not seen any network changes, even // Check that system default network callback has not seen any network changes, even