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

Commit 2c3cf995 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Allow TRANSPORT_TEST ethernet networks" into rvc-dev am: fcd1fd8f 

Original change: undetermined

Change-Id: I5c74c1bc36ece01ae2720d061df288c8d44cd59b
parents 353eaec3 fcd1fd8f

core/java/android/net/NetworkCapabilities.java

+10 −2
Original line number Diff line number Diff line
@@ -679,13 +679,14 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    public void restrictCapabilitesForTestNetwork(int creatorUid) {

        final long originalCapabilities = mNetworkCapabilities;

        final long originalTransportTypes = mTransportTypes;

        final NetworkSpecifier originalSpecifier = mNetworkSpecifier;

        final int originalSignalStrength = mSignalStrength;

        final int originalOwnerUid = getOwnerUid();

        final int[] originalAdministratorUids = getAdministratorUids();

        clearAll();

        // Reset the transports to only contain TRANSPORT_TEST.

        mTransportTypes = (1 << TRANSPORT_TEST);

        mTransportTypes = (originalTransportTypes & TEST_NETWORKS_ALLOWED_TRANSPORTS)

                | (1 << TRANSPORT_TEST);

        mNetworkCapabilities = originalCapabilities & TEST_NETWORKS_ALLOWED_CAPABILITIES;

        mNetworkSpecifier = originalSpecifier;

        mSignalStrength = originalSignalStrength;
@@ -786,6 +787,13 @@ public final class NetworkCapabilities implements Parcelable { 
        "TEST"

    };



    /**

     * Allowed transports on a test network, in addition to TRANSPORT_TEST.

     */

    private static final int TEST_NETWORKS_ALLOWED_TRANSPORTS = 1 << TRANSPORT_TEST

            // Test ethernet networks can be created with EthernetManager#setIncludeTestInterfaces

            | 1 << TRANSPORT_ETHERNET;



    /**

     * Adds the given transport type to this {@code NetworkCapability} instance.

     * Multiple transports may be applied.  Note that when searching