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

Commit 0834d86f authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Allow tests to create TRANSPORT_TEST|TRANSPORT_VPN networks. am: 45feed9b am: aa3254e8 

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

Change-Id: Ib262f33cf2f467bf6610e2910d96fbcacb733a54
parents dbcfe786 aa3254e8

core/java/android/net/NetworkCapabilities.java

+4 −1
Original line number Diff line number Diff line
@@ -712,6 +712,7 @@ public final class NetworkCapabilities implements Parcelable { 
        if (ArrayUtils.contains(originalAdministratorUids, creatorUid)) {

            setAdministratorUids(new int[] {creatorUid});

        }

        // There is no need to clear the UIDs, they have already been cleared by clearAll() above.

    }



    /**
@@ -805,7 +806,9 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    private static final int TEST_NETWORKS_ALLOWED_TRANSPORTS = 1 << TRANSPORT_TEST

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

            | 1 << TRANSPORT_ETHERNET;

            | 1 << TRANSPORT_ETHERNET

            // Test VPN networks can be created but their UID ranges must be empty.

            | 1 << TRANSPORT_VPN;



    /**

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