| commit | 577192d9f1b687b5c20b83e2f4e74c72bb6232a2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Nov 29 09:44:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 29 09:44:08 2021 +0000 |
| tree | 7c6fa8a5a130fb43b13e1466260c2e9cb06925b5 | |
| parent | 6270a2577f321aed55d77610f524e9903b3f667f [diff] | |
| parent | 44a20af4a32f68bec07e57aeb0c7a9fd09bf228c [diff] |
Merge "Competing network interfaces" am: 44a20af4a3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903360 Change-Id: Iad4f9bde61143f37fa7df00c8f17b3d07e0059c3
diff --git a/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt b/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt index 5290f0d..8e98dba 100644 --- a/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt +++ b/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt
@@ -25,7 +25,6 @@ import android.net.InetAddresses import android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL import android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED -import android.net.NetworkCapabilities.TRANSPORT_ETHERNET import android.net.NetworkCapabilities.TRANSPORT_TEST import android.net.NetworkRequest import android.net.TestNetworkInterface @@ -96,7 +95,6 @@ private val ethRequest = NetworkRequest.Builder() // ETHERNET|TEST transport networks do not have NET_CAPABILITY_TRUSTED .removeCapability(NET_CAPABILITY_TRUSTED) - .addTransportType(TRANSPORT_ETHERNET) .addTransportType(TRANSPORT_TEST).build() private val ethRequestCb = TestableNetworkCallback()