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

Commit 7cf5b419 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix some alt-network issues. 

Two issues.
1) remove default routes for non-default networks.
2) don't report mobile is the active default network just because
   it is active.

bug:4157610
Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
parent 6a19759c

core/java/android/net/NetworkStateTracker.java

+3 −0
Original line number Diff line number Diff line
@@ -410,4 +410,7 @@ public abstract class NetworkStateTracker extends Handler { 
    public void interpretScanResultsAvailable() {

    }



    public String getInterfaceName() {

        return mInterfaceName;

    }

}

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

+11 −12
Original line number Diff line number Diff line
@@ -591,18 +591,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
     */

    public NetworkInfo getActiveNetworkInfo() {

        enforceAccessPermission();

        for (int type=0; type <= ConnectivityManager.MAX_NETWORK_TYPE; type++) {

            if (mNetAttributes[type] == null || !mNetAttributes[type].isDefault()) {

                continue;

            }

            NetworkStateTracker t = mNetTrackers[type];

            NetworkInfo info = t.getNetworkInfo();

            if (info.isConnected()) {

                if (DBG && type != mActiveDefaultNetwork) Slog.e(TAG,

                        "connected default network is not " +

                        "mActiveDefaultNetwork!");

                return info;

            }

        if (mActiveDefaultNetwork != -1) {

            return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();

        }

        return null;

    }
@@ -1338,6 +1328,15 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            if (mNetAttributes[netType].isDefault()) {

                mNetTrackers[netType].addDefaultRoute();

            } else {

                // many radios add a default route even when we don't want one.

                // remove the default interface unless we need it for our active network

                if (mActiveDefaultNetwork != -1) {

                    String defaultIface = mNetTrackers[mActiveDefaultNetwork].getInterfaceName();

                    if (defaultIface != null &&

                            !defaultIface.equals(mNetTrackers[netType].getInterfaceName())) {

                        mNetTrackers[netType].removeDefaultRoute();

                    }

                }

                mNetTrackers[netType].addPrivateDnsRoutes();

            }

        } else {