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

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

Merge changes I3711b362,I49421183,Icc0701cb,I2f5ccc1d am: cbd6dbc5 

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

Change-Id: I021b2719e8b6d76cbb64d979f1ce5f661a1a25a5
parents 17035aec cbd6dbc5

core/java/android/net/NetworkCapabilities.java

+12 −6
Original line number Original line Diff line number Diff line
@@ -1802,21 +1802,27 @@ public final class NetworkCapabilities implements Parcelable { 
            sb.append(" OwnerUid: ").append(mOwnerUid);

            sb.append(" OwnerUid: ").append(mOwnerUid);

        }

        }





        if (mAdministratorUids.length == 0) {

        if (!ArrayUtils.isEmpty(mAdministratorUids)) {

            sb.append(" AdministratorUids: ").append(Arrays.toString(mAdministratorUids));

            sb.append(" AdminUids: ").append(Arrays.toString(mAdministratorUids));

        }



        if (mRequestorUid != Process.INVALID_UID) {

            sb.append(" RequestorUid: ").append(mRequestorUid);

        }



        if (mRequestorPackageName != null) {

            sb.append(" RequestorPkg: ").append(mRequestorPackageName);

        }

        }





        if (null != mSSID) {

        if (null != mSSID) {

            sb.append(" SSID: ").append(mSSID);

            sb.append(" SSID: ").append(mSSID);

        }

        }







        if (mPrivateDnsBroken) {

        if (mPrivateDnsBroken) {

            sb.append(" Private DNS is broken");

            sb.append(" PrivateDnsBroken");

        }

        }





        sb.append(" RequestorUid: ").append(mRequestorUid);

        sb.append(" RequestorPackageName: ").append(mRequestorPackageName);



        sb.append("]");

        sb.append("]");

        return sb.toString();

        return sb.toString();

    }

    }

services/core/java/com/android/server/connectivity/Vpn.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,8 @@ public class Vpn { 
    @VisibleForTesting protected String mPackage;

    @VisibleForTesting protected String mPackage;

    private int mOwnerUID;

    private int mOwnerUID;

    private boolean mIsPackageTargetingAtLeastQ;

    private boolean mIsPackageTargetingAtLeastQ;

    private String mInterface;

    @VisibleForTesting

    protected String mInterface;

    private Connection mConnection;

    private Connection mConnection;





    /** Tracks the runners for all VPN types managed by the platform (eg. LegacyVpn, PlatformVpn) */

    /** Tracks the runners for all VPN types managed by the platform (eg. LegacyVpn, PlatformVpn) */

tests/net/integration/util/com/android/server/TestNetIdManager.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,4 +35,5 @@ class TestNetIdManager : NetIdManager() { 
    private val nextId = AtomicInteger(MAX_NET_ID)

    private val nextId = AtomicInteger(MAX_NET_ID)

    override fun reserveNetId() = nextId.decrementAndGet()

    override fun reserveNetId() = nextId.decrementAndGet()

    override fun releaseNetId(id: Int) = Unit

    override fun releaseNetId(id: Int) = Unit

    fun peekNextNetId() = nextId.get() - 1

}
 
}

tests/net/java/com/android/server/ConnectivityServiceTest.java

+226 −49

File changed.

Preview size limit exceeded, changes collapsed.