Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1764ceaa authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge changes from topic "ethernet_specifier" am: c77293b7 am: 2943678b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I772ca29f64cb9431a899a2c213c511ad467fc36f
parents 734c56f7 2943678b

tests/net/common/java/android/net/NetworkCapabilitiesTest.java

+4 −3
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import android.util.ArraySet; 
import androidx.test.runner.AndroidJUnit4;



import com.android.modules.utils.build.SdkLevel;

import com.android.testutils.CompatUtil;

import com.android.testutils.DevSdkIgnoreRule;

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
@@ -211,7 +212,7 @@ public class NetworkCapabilitiesTest { 
        nc1 = new NetworkCapabilities().addTransportType(TRANSPORT_WIFI);

        nc2 = new NetworkCapabilities()

                .addTransportType(TRANSPORT_WIFI)

                .setNetworkSpecifier(new EthernetNetworkSpecifier("eth42"));

                .setNetworkSpecifier(CompatUtil.makeEthernetNetworkSpecifier("eth42"));

        assertNotEquals("", nc1.describeImmutableDifferences(nc2));

        assertEquals("", nc1.describeImmutableDifferences(nc1));

    }
@@ -671,7 +672,7 @@ public class NetworkCapabilitiesTest { 
        NetworkCapabilities nc1 = new NetworkCapabilities();

        nc1.addTransportType(TRANSPORT_CELLULAR).addTransportType(TRANSPORT_WIFI);

        try {

            nc1.setNetworkSpecifier(new EthernetNetworkSpecifier("eth0"));

            nc1.setNetworkSpecifier(CompatUtil.makeEthernetNetworkSpecifier("eth0"));

            fail("Cannot set NetworkSpecifier on a NetworkCapability with multiple transports!");

        } catch (IllegalStateException expected) {

            // empty
@@ -680,7 +681,7 @@ public class NetworkCapabilitiesTest { 
        // Sequence 2: Transport + NetworkSpecifier + Transport

        NetworkCapabilities nc2 = new NetworkCapabilities();

        nc2.addTransportType(TRANSPORT_CELLULAR).setNetworkSpecifier(

                new EthernetNetworkSpecifier("testtap3"));

                CompatUtil.makeEthernetNetworkSpecifier("testtap3"));

        try {

            nc2.addTransportType(TRANSPORT_WIFI);

            fail("Cannot set a second TransportType of a network which has a NetworkSpecifier!");

tests/net/common/java/android/net/NetworkProviderTest.kt

+5 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.os.HandlerThread 
import android.os.Looper

import androidx.test.InstrumentationRegistry

import com.android.net.module.util.ArrayTrackRecord

import com.android.testutils.CompatUtil

import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo

import com.android.testutils.DevSdkIgnoreRunner

import com.android.testutils.isDevSdkInRange
@@ -102,7 +103,8 @@ class NetworkProviderTest { 
        mCm.registerNetworkProvider(provider)

        assertNotEquals(provider.getProviderId(), NetworkProvider.ID_NONE)



        val specifier = EthernetNetworkSpecifier(UUID.randomUUID().toString())

        val specifier = CompatUtil.makeTestNetworkSpecifier(

                UUID.randomUUID().toString())

        val nr: NetworkRequest = NetworkRequest.Builder()

                .addTransportType(TRANSPORT_TEST)

                .setNetworkSpecifier(specifier)
@@ -183,7 +185,8 @@ class NetworkProviderTest { 


        mCm.registerNetworkProvider(provider)



        val specifier = EthernetNetworkSpecifier(UUID.randomUUID().toString())

        val specifier = CompatUtil.makeTestNetworkSpecifier(

                UUID.randomUUID().toString())

        val nr: NetworkRequest = NetworkRequest.Builder()

                .addTransportType(TRANSPORT_TEST)

                .setNetworkSpecifier(specifier)