Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56

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

Change-Id: I0de41fe2ba6d2bc691b5693a81da368ae5e0e025
This commit is contained in:
Treehugger Robot
2021-05-14 06:10:30 +00:00
committed by Automerger Merge Worker

View File

@@ -596,8 +596,7 @@ 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)
// 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))