| commit | 558c2644dee95816a818afc255f54aa535c315bc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Nov 29 09:56:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 29 09:56:25 2021 +0000 |
| tree | 00c1a87935d912b2e53887b63b812d5698257e17 | |
| parent | a08199b183deb1aee03f6919d23c7c5a7354e606 [diff] | |
| parent | cac7575885035266e1adba0a0c2b52896897ed78 [diff] |
Merge "Competing network interfaces" am: 44a20af4a3 am: cac7575885 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903360 Change-Id: I6063144af454a7eda179ec06cea816ac033e002e
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()