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

Commit 2d37070e authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix legacy APIs. 

Two fixes.  First make sure we mark the request as handled by the network handling it.
Second, convert ensureRouteToHostForAddress to use the new legacyNetworkForType.

bug:14993207
Change-Id: I230968938ca0ed91f834b36a2af60caff2eab682
parent 32aa65a1

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

+16 −12
Original line number Diff line number Diff line
@@ -1754,31 +1754,34 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            if (DBG) log("requestRouteToHostAddress on invalid network: " + networkType);

            return false;

        }

        NetworkStateTracker tracker = mNetTrackers[networkType];

        DetailedState netState = DetailedState.DISCONNECTED;

        if (tracker != null) {

            netState = tracker.getNetworkInfo().getDetailedState();



        NetworkAgentInfo nai = mLegacyTypeTracker.getNetworkForType(networkType);

        if (nai == null) {

            if (mLegacyTypeTracker.isTypeSupported(networkType) == false) {

                if (DBG) log("requestRouteToHostAddress on unsupported network: " + networkType);

            } else {

                if (DBG) log("requestRouteToHostAddress on down network: " + networkType);

            }

            return false;

        }



        DetailedState netState = nai.networkInfo.getDetailedState();



        if ((netState != DetailedState.CONNECTED &&

                netState != DetailedState.CAPTIVE_PORTAL_CHECK) ||

                tracker.isTeardownRequested()) {

                netState != DetailedState.CAPTIVE_PORTAL_CHECK)) {

            if (VDBG) {

                log("requestRouteToHostAddress on down network "

                        + "(" + networkType + ") - dropped"

                        + " tracker=" + tracker

                        + " netState=" + netState

                        + " isTeardownRequested="

                            + ((tracker != null) ? tracker.isTeardownRequested() : "tracker:null"));

                        + " netState=" + netState);

            }

            return false;

        }

        final int uid = Binder.getCallingUid();

        final long token = Binder.clearCallingIdentity();

        try {

            LinkProperties lp = tracker.getLinkProperties();

            LinkProperties lp = nai.linkProperties;

            boolean ok = modifyRouteToAddress(lp, addr, ADD, TO_DEFAULT_TABLE, exempt,

                    tracker.getNetwork().netId, uid);

                    nai.network.netId, uid);

            if (DBG) log("requestRouteToHostAddress ok=" + ok);

            return ok;

        } finally {
@@ -3316,6 +3319,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        if (bestNetwork != null) {

            if (VDBG) log("using " + bestNetwork.name());

            bestNetwork.addRequest(nri.request);

            mNetworkForRequestId.put(nri.request.requestId, bestNetwork);

            int legacyType = nri.request.legacyType;

            if (legacyType != TYPE_NONE) {

                mLegacyTypeTracker.add(legacyType, bestNetwork);