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

Commit 8d6839b2 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android Git Automerger
Browse files

am 31453e5a: Merge "Reset connections on all stacked interfaces." into jb-mr2-dev 

* commit '31453e5a':
  Reset connections on all stacked interfaces.
parents 1bb7b69b 31453e5a

core/java/android/net/LinkProperties.java

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

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

    public Collection<InetAddress> getAddresses() {

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

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

        for (LinkAddress linkAddress : mLinkAddresses) {

        for (LinkAddress linkAddress : mLinkAddresses) {

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

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

        if (resetMask != 0 || resetDns) {

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

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

            if (linkProperties != null) {

            if (linkProperties != null) {

                String iface = linkProperties.getInterfaceName();

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

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

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

                        if (resetMask != 0) {

                        if (resetMask != 0) {

                            if (DBG) log("resetConnections(" + iface + ", " + resetMask + ")");

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

                    }

                }

                }

            }

            }

        }





        // Update 464xlat state.

        // Update 464xlat state.

        // TODO: Move to handleConnect()

        // TODO: Move to handleConnect()