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

Merge "Add session ID to VpnTransportInfo" am: 320cd17220

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

Change-Id: I2bcafaaeb3f9dd2030745f1f7fa52f10f60733dd
This commit is contained in:
Frank Li
2021-04-06 07:01:13 +00:00
committed by Automerger Merge Worker
parent 3f29d3ef39 320cd17220
commit 45d9b25a36
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
View File

@@ -547,6 +547,7 @@ class NetworkAgentTest {
@Test @Test
@IgnoreUpTo(Build.VERSION_CODES.R) @IgnoreUpTo(Build.VERSION_CODES.R)
fun testSetUnderlyingNetworksAndVpnSpecifier() { fun testSetUnderlyingNetworksAndVpnSpecifier() {
val mySessionId = "MySession12345"
val request = NetworkRequest.Builder() val request = NetworkRequest.Builder()
.addTransportType(TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.addTransportType(TRANSPORT_VPN) .addTransportType(TRANSPORT_VPN)
@@ -560,7 +561,7 @@ class NetworkAgentTest {
addTransportType(TRANSPORT_TEST) addTransportType(TRANSPORT_TEST)
addTransportType(TRANSPORT_VPN) addTransportType(TRANSPORT_VPN)
removeCapability(NET_CAPABILITY_NOT_VPN) removeCapability(NET_CAPABILITY_NOT_VPN)
setTransportInfo(VpnTransportInfo(VpnManager.TYPE_VPN_SERVICE)) setTransportInfo(VpnTransportInfo(VpnManager.TYPE_VPN_SERVICE, mySessionId))
if (SdkLevel.isAtLeastS()) { if (SdkLevel.isAtLeastS()) {
addCapability(NET_CAPABILITY_NOT_VCN_MANAGED) addCapability(NET_CAPABILITY_NOT_VCN_MANAGED)
} }
@@ -580,6 +581,8 @@ class NetworkAgentTest {
assertNotNull(vpnNc) assertNotNull(vpnNc)
assertEquals(VpnManager.TYPE_VPN_SERVICE, assertEquals(VpnManager.TYPE_VPN_SERVICE,
(vpnNc.transportInfo as VpnTransportInfo).type) (vpnNc.transportInfo as VpnTransportInfo).type)
// TODO: b/183938194 please fix the issue and enable following check.
// assertEquals(mySessionId, (vpnNc.transportInfo as VpnTransportInfo).sessionId)
val testAndVpn = intArrayOf(TRANSPORT_TEST, TRANSPORT_VPN) val testAndVpn = intArrayOf(TRANSPORT_TEST, TRANSPORT_VPN)
assertTrue(hasAllTransports(vpnNc, testAndVpn)) assertTrue(hasAllTransports(vpnNc, testAndVpn))