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

Commit 8fad7ee1 authored by Michael Jurka's avatar Michael Jurka
Browse files

Fix the build 

Revert "am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp"

This reverts commit 352f2c33, reversing
changes made to ce8a55db.
parent 47015057

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

+13 −16
Original line number Diff line number Diff line
@@ -543,8 +543,18 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
     */

    public NetworkInfo getActiveNetworkInfo() {

        enforceAccessPermission();

        if (mActiveDefaultNetwork != -1) {

            return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();

        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) {

                    loge("connected default network is not mActiveDefaultNetwork!");

                }

                return info;

            }

        }

        return null;

    }
@@ -1343,20 +1353,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                handleApplyDefaultProxy(netType);

                addDefaultRoute(mNetTrackers[netType]);

            } 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) {

                    LinkProperties linkProperties =

                            mNetTrackers[mActiveDefaultNetwork].getLinkProperties();

                    LinkProperties newLinkProperties =

                            mNetTrackers[netType].getLinkProperties();

                    String defaultIface = linkProperties.getInterfaceName();

                    if (defaultIface != null &&

                            !defaultIface.equals(newLinkProperties.getInterfaceName())) {

                        mNetTrackers[netType].removeDefaultRoute();

                    }

                }

                mNetTrackers[netType].addPrivateDnsRoutes();

                addPrivateDnsRoutes(mNetTrackers[netType]);

            }

        } else {

            if (mNetAttributes[netType].isDefault()) {