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

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

Merge "Ensure all calls to getCallingUid use the version in mDeps." am: d610e433 am: 3559535c 

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

Change-Id: Ib427fa0d6d9b2ecf35e820db9eb1dc762a81bb3a
parents 7c204b87 3559535c

services/core/java/com/android/server/ConnectivityService.java

+6 −6
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }



        // No need to check mLockdownEnabled. If it's true, getVpnUnderlyingNetworks returns null.

        final Network[] networks = getVpnUnderlyingNetworks(Binder.getCallingUid());

        final Network[] networks = getVpnUnderlyingNetworks(mDeps.getCallingUid());

        if (null != networks) {

            for (final Network network : networks) {

                final NetworkCapabilities nc = getNetworkCapabilitiesInternal(network);
@@ -3647,7 +3647,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                log("Replacing " + existingRequest.mRequests.get(0) + " with "

                        + nri.mRequests.get(0) + " because their intents matched.");

            }

            handleReleaseNetworkRequest(existingRequest.mRequests.get(0), getCallingUid(),

            handleReleaseNetworkRequest(existingRequest.mRequests.get(0), mDeps.getCallingUid(),

                    /* callOnUnavailable */ false);

        }

        handleRegisterNetworkRequest(nri);
@@ -5730,14 +5730,14 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    private void releasePendingNetworkRequestWithDelay(PendingIntent operation) {

        mHandler.sendMessageDelayed(

                mHandler.obtainMessage(EVENT_RELEASE_NETWORK_REQUEST_WITH_INTENT,

                getCallingUid(), 0, operation), mReleasePendingIntentDelayMs);

                mDeps.getCallingUid(), 0, operation), mReleasePendingIntentDelayMs);

    }



    @Override

    public void releasePendingNetworkRequest(PendingIntent operation) {

        Objects.requireNonNull(operation, "PendingIntent cannot be null.");

        mHandler.sendMessage(mHandler.obtainMessage(EVENT_RELEASE_NETWORK_REQUEST_WITH_INTENT,

                getCallingUid(), 0, operation));

                mDeps.getCallingUid(), 0, operation));

    }



    // In order to implement the compatibility measure for pre-M apps that call
@@ -5834,7 +5834,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    public void releaseNetworkRequest(NetworkRequest networkRequest) {

        ensureNetworkRequestHasType(networkRequest);

        mHandler.sendMessage(mHandler.obtainMessage(

                EVENT_RELEASE_NETWORK_REQUEST, getCallingUid(), 0, networkRequest));

                EVENT_RELEASE_NETWORK_REQUEST, mDeps.getCallingUid(), 0, networkRequest));

    }



    private void handleRegisterNetworkProvider(NetworkProviderInfo npi) {
@@ -8312,7 +8312,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


        final NetworkAgentInfo vpn = getVpnForUid(uid);

        if (vpn == null || getVpnType(vpn) != VpnManager.TYPE_VPN_SERVICE

                || vpn.networkCapabilities.getOwnerUid() != Binder.getCallingUid()) {

                || vpn.networkCapabilities.getOwnerUid() != mDeps.getCallingUid()) {

            return INVALID_UID;

        }