commit | 83016aca6ce0726ccc00d4f49010169dee2352d5 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri May 14 07:09:24 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 14 07:09:24 2021 +0000 |
tree | 81f3f24b933083869658cb71e22248638646148d | |
parent | 29ea3d8562f84ec2beb1285f38caf4042e1ecf26 [diff] | |
parent | 3c5a00a31cc9f134c228616dc8b702e211f898e8 [diff] |
Merge "Re-enable check for VpnTransportInfo session ID." am: 6748f93e56 am: c7ea77ce6a am: ad56a81b2d am: 3c5a00a31c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705135 Change-Id: I1d8925ca5f70f226ee5fd36e473e283549195f33
diff --git a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt index b6fa7f8..e13e92e 100644 --- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt +++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
@@ -606,8 +606,7 @@ 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))