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

Commit 31453e5a authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Reset connections on all stacked interfaces." into jb-mr2-dev

parents 32b9f625 4aa9bcf4

core/java/android/net/LinkProperties.java

+9 −0
Original line number Diff line number Diff line
@@ -119,6 +119,15 @@ public class LinkProperties implements Parcelable { 
        return mIfaceName;

    }



    public Collection<String> getAllInterfaceNames() {

        Collection interfaceNames = new ArrayList<String>(mStackedLinks.size() + 1);

        interfaceNames.add(new String(mIfaceName));

        for (LinkProperties stacked: mStackedLinks.values()) {

            interfaceNames.addAll(stacked.getAllInterfaceNames());

        }

        return interfaceNames;

    }



    public Collection<InetAddress> getAddresses() {

        Collection<InetAddress> addresses = new ArrayList<InetAddress>();

        for (LinkAddress linkAddress : mLinkAddresses) {

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

+20 −19
Original line number Diff line number Diff line
@@ -2256,7 +2256,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        if (resetMask != 0 || resetDns) {

            LinkProperties linkProperties = mNetTrackers[netType].getLinkProperties();

            if (linkProperties != null) {

                String iface = linkProperties.getInterfaceName();

                for (String iface : linkProperties.getAllInterfaceNames()) {

                    if (TextUtils.isEmpty(iface) == false) {

                        if (resetMask != 0) {

                            if (DBG) log("resetConnections(" + iface + ", " + resetMask + ")");
@@ -2281,6 +2281,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                    }

                }

            }

        }



        // Update 464xlat state.

        // TODO: Move to handleConnect()