From 2cdbbc1a32450ee616e32955229cb05f678c1711 Mon Sep 17 00:00:00 2001 From: Davor Majdandzic Date: Thu, 25 Nov 2021 17:37:45 +0100 Subject: [PATCH] Competing network interfaces NetworkRequest is expecting transport type Ethernet or test. This causes the test 'testApiCallbacks' to fail for devices that have a non-test Ethernet network since that network is being chosen instead of the expected test Ethernet network. Remove network capability TRANSPORT_ETHERNET from CaptivePortalApiTest. Bug: 204329523 Test: atest android.net.cts.CaptivePortalApiTest#testApiCallbacks Signed-off-by: Davor Majdandzic Change-Id: Ie7b4d00c08f1497044e63462f1d899d1f3dea2df --- tests/cts/net/src/android/net/cts/NetworkValidationTest.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt b/tests/cts/net/src/android/net/cts/NetworkValidationTest.kt index 5290f0db28..8e98dba20f 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.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()