LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from topic "ethernet_specifier" am: 92e9f17915

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef1a287439b5f5705ff3b3b4de4ded54f61c1c1
This commit is contained in:
Remi NGUYEN VAN
2021-03-12 00:12:52 +00:00
committed by Automerger Merge Worker
parent f680bb763a 92e9f17915
commit 7af6af880c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/net/common/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -68,6 +68,7 @@ import android.util.ArraySet;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.modules.utils.build.SdkLevel; import com.android.modules.utils.build.SdkLevel;
import com.android.testutils.CompatUtil;
import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
@@ -211,7 +212,7 @@ public class NetworkCapabilitiesTest {
nc1 = new NetworkCapabilities().addTransportType(TRANSPORT_WIFI); nc1 = new NetworkCapabilities().addTransportType(TRANSPORT_WIFI);
nc2 = new NetworkCapabilities() nc2 = new NetworkCapabilities()
.addTransportType(TRANSPORT_WIFI) .addTransportType(TRANSPORT_WIFI)
.setNetworkSpecifier(new EthernetNetworkSpecifier("eth42")); .setNetworkSpecifier(CompatUtil.makeEthernetNetworkSpecifier("eth42"));
assertNotEquals("", nc1.describeImmutableDifferences(nc2)); assertNotEquals("", nc1.describeImmutableDifferences(nc2));
assertEquals("", nc1.describeImmutableDifferences(nc1)); assertEquals("", nc1.describeImmutableDifferences(nc1));
} }
@@ -671,7 +672,7 @@ public class NetworkCapabilitiesTest {
NetworkCapabilities nc1 = new NetworkCapabilities(); NetworkCapabilities nc1 = new NetworkCapabilities();
nc1.addTransportType(TRANSPORT_CELLULAR).addTransportType(TRANSPORT_WIFI); nc1.addTransportType(TRANSPORT_CELLULAR).addTransportType(TRANSPORT_WIFI);
try { try {
nc1.setNetworkSpecifier(new EthernetNetworkSpecifier("eth0")); nc1.setNetworkSpecifier(CompatUtil.makeEthernetNetworkSpecifier("eth0"));
fail("Cannot set NetworkSpecifier on a NetworkCapability with multiple transports!"); fail("Cannot set NetworkSpecifier on a NetworkCapability with multiple transports!");
} catch (IllegalStateException expected) { } catch (IllegalStateException expected) {
// empty // empty
@@ -680,7 +681,7 @@ public class NetworkCapabilitiesTest {
// Sequence 2: Transport + NetworkSpecifier + Transport // Sequence 2: Transport + NetworkSpecifier + Transport
NetworkCapabilities nc2 = new NetworkCapabilities(); NetworkCapabilities nc2 = new NetworkCapabilities();
nc2.addTransportType(TRANSPORT_CELLULAR).setNetworkSpecifier( nc2.addTransportType(TRANSPORT_CELLULAR).setNetworkSpecifier(
new EthernetNetworkSpecifier("testtap3")); CompatUtil.makeEthernetNetworkSpecifier("testtap3"));
try { try {
nc2.addTransportType(TRANSPORT_WIFI); nc2.addTransportType(TRANSPORT_WIFI);
fail("Cannot set a second TransportType of a network which has a NetworkSpecifier!"); fail("Cannot set a second TransportType of a network which has a NetworkSpecifier!");

7
tests/net/common/java/android/net/NetworkProviderTest.kt
View File

@@ -27,6 +27,7 @@ import android.os.HandlerThread
import android.os.Looper import android.os.Looper
import androidx.test.InstrumentationRegistry import androidx.test.InstrumentationRegistry
import com.android.net.module.util.ArrayTrackRecord import com.android.net.module.util.ArrayTrackRecord
import com.android.testutils.CompatUtil
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.DevSdkIgnoreRunner import com.android.testutils.DevSdkIgnoreRunner
import com.android.testutils.isDevSdkInRange import com.android.testutils.isDevSdkInRange
@@ -102,7 +103,8 @@ class NetworkProviderTest {
mCm.registerNetworkProvider(provider) mCm.registerNetworkProvider(provider)
assertNotEquals(provider.getProviderId(), NetworkProvider.ID_NONE) assertNotEquals(provider.getProviderId(), NetworkProvider.ID_NONE)
val specifier = EthernetNetworkSpecifier(UUID.randomUUID().toString()) val specifier = CompatUtil.makeTestNetworkSpecifier(
UUID.randomUUID().toString())
val nr: NetworkRequest = NetworkRequest.Builder() val nr: NetworkRequest = NetworkRequest.Builder()
.addTransportType(TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.setNetworkSpecifier(specifier) .setNetworkSpecifier(specifier)
@@ -183,7 +185,8 @@ class NetworkProviderTest {
mCm.registerNetworkProvider(provider) mCm.registerNetworkProvider(provider)
val specifier = EthernetNetworkSpecifier(UUID.randomUUID().toString()) val specifier = CompatUtil.makeTestNetworkSpecifier(
UUID.randomUUID().toString())
val nr: NetworkRequest = NetworkRequest.Builder() val nr: NetworkRequest = NetworkRequest.Builder()
.addTransportType(TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.setNetworkSpecifier(specifier) .setNetworkSpecifier(specifier)