Merge "Competing network interfaces" am: 44a20af4a3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903360 Change-Id: Iad4f9bde61143f37fa7df00c8f17b3d07e0059c3
This commit is contained in:
commit
577192d9f1
1 changed files with 0 additions and 2 deletions
|
|
@ -25,7 +25,6 @@ import android.net.EthernetManager
|
|||
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 @@ class NetworkValidationTest {
|
|||
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()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue