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

Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a am: ad56a81b2d am: 3c5a00a31c

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

Change-Id: I1d8925ca5f70f226ee5fd36e473e283549195f33
This commit is contained in:
Treehugger Robot
2021-05-14 07:09:24 +00:00
committed by Automerger Merge Worker
parent 29ea3d8562 3c5a00a31c
commit 83016aca6c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -606,8 +606,7 @@ class NetworkAgentTest {
assertNotNull(vpnNc)
assertEquals(VpnManager.TYPE_VPN_SERVICE,
(vpnNc.transportInfo as VpnTransportInfo).type)
// TODO: b/183938194 please fix the issue and enable following check.
// assertEquals(mySessionId, (vpnNc.transportInfo as VpnTransportInfo).sessionId)
assertEquals(mySessionId, (vpnNc.transportInfo as VpnTransportInfo).sessionId)
val testAndVpn = intArrayOf(TRANSPORT_TEST, TRANSPORT_VPN)
assertTrue(hasAllTransports(vpnNc, testAndVpn))