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

Commit 626c042a authored by James Mattis's avatar James Mattis
Browse files

Update to Diagnostic Callback flows for multilayer 

Updates to ConnectivityDiagnosticsCallback flows that directly accessed
the NRI 'request' member to now instead use mRequests. This will be done
by first not allowing multilayer requests on registration of a
connectivity diagnostic and then accessing the '0' index of mRequests.

Bug: 174187714
Bug: 171991028
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Ida98036b70fa290a214ee23236bfd0aad08e90a3
parent 9f2c1589

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

+13 −4
Original line number Diff line number Diff line
@@ -3591,8 +3591,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    private boolean isNetworkPotentialSatisfier(

            @NonNull final NetworkAgentInfo candidate, @NonNull final NetworkRequestInfo nri) {

        // listen requests won't keep up a network satisfying it. If this is not a multilayer

        // request, we can return immediately. For multilayer requests, we have to check to see if

        // any of the multilayer requests may have a potential satisfier.

        // request, return immediately. For multilayer requests, check to see if any of the

        // multilayer requests may have a potential satisfier.

        if (!nri.isMultilayerRequest() && nri.mRequests.get(0).isListen()) {

            return false;

        }
@@ -8233,6 +8233,13 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        final IBinder iCb = cb.asBinder();

        final NetworkRequestInfo nri = cbInfo.mRequestInfo;



        // Connectivity Diagnostics are meant to be used with a single network request. It would be

        // confusing for these networks to change when an NRI is satisfied in another layer.

        if (nri.isMultilayerRequest()) {

            throw new IllegalArgumentException("Connectivity Diagnostics do not support multilayer "

                + "network requests.");

        }



        // This means that the client registered the same callback multiple times. Do

        // not override the previous entry, and exit silently.

        if (mConnectivityDiagnosticsCallbacks.containsKey(iCb)) {
@@ -8259,7 +8266,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        synchronized (mNetworkForNetId) {

            for (int i = 0; i < mNetworkForNetId.size(); i++) {

                final NetworkAgentInfo nai = mNetworkForNetId.valueAt(i);

                if (nai.satisfies(nri.request)) {

                // Connectivity Diagnostics rejects multilayer requests at registration hence get(0)

                if (nai.satisfies(nri.mRequests.get(0))) {

                    matchingNetworks.add(nai);

                }

            }
@@ -8387,7 +8395,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                mConnectivityDiagnosticsCallbacks.entrySet()) {

            final ConnectivityDiagnosticsCallbackInfo cbInfo = entry.getValue();

            final NetworkRequestInfo nri = cbInfo.mRequestInfo;

            if (nai.satisfies(nri.request)) {

            // Connectivity Diagnostics rejects multilayer requests at registration hence get(0).

            if (nai.satisfies(nri.mRequests.get(0))) {

                if (checkConnectivityDiagnosticsPermissions(

                        nri.mPid, nri.mUid, nai, cbInfo.mCallingPackageName)) {

                    results.add(entry.getValue().mCb);