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

Commit f3cab63e authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Change removeStackedLink to take an interface name. 

This simplifies callers.

Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.

Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
parent f6df7bff

core/java/android/net/BaseNetworkStateTracker.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -169,16 +169,6 @@ public abstract class BaseNetworkStateTracker implements NetworkStateTracker { 
        // Base tracker doesn't handle dependencies

        // Base tracker doesn't handle dependencies

    }

    }





    @Override

    public void addStackedLink(LinkProperties link) {

        mLinkProperties.addStackedLink(link);

    }



    @Override

    public void removeStackedLink(LinkProperties link) {

        mLinkProperties.removeStackedLink(link);

    }



    @Override

    @Override

    public void supplyMessenger(Messenger messenger) {

    public void supplyMessenger(Messenger messenger) {

        // not supported on this network

        // not supported on this network

core/java/android/net/LinkProperties.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -493,16 +493,16 @@ public final class LinkProperties implements Parcelable { 
    /**

    /**

     * Removes a stacked link.

     * Removes a stacked link.

     *

     *

     * If there a stacked link with the same interfacename as link, it is

     * If there is a stacked link with the given interface name, it is

     * removed. Otherwise, nothing changes.

     * removed. Otherwise, nothing changes.

     *

     *

     * @param link The link to remove.

     * @param iface The interface name of the link to remove.

     * @return true if the link was removed, false otherwise.

     * @return true if the link was removed, false otherwise.

     * @hide

     * @hide

     */

     */

    public boolean removeStackedLink(LinkProperties link) {

    public boolean removeStackedLink(String iface) {

        if (link != null && link.getInterfaceName() != null) {

        if (iface != null) {

            LinkProperties removed = mStackedLinks.remove(link.getInterfaceName());

            LinkProperties removed = mStackedLinks.remove(iface);

            return removed != null;

            return removed != null;

        }

        }

        return false;

        return false;

core/java/android/net/MobileDataStateTracker.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -660,16 +660,6 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { 
        return retVal;

        return retVal;

    }

    }





    @Override

    public void addStackedLink(LinkProperties link) {

        mLinkProperties.addStackedLink(link);

    }



    @Override

    public void removeStackedLink(LinkProperties link) {

        mLinkProperties.removeStackedLink(link);

    }



    @Override

    @Override

    public String toString() {

    public String toString() {

        final CharArrayWriter writer = new CharArrayWriter();

        final CharArrayWriter writer = new CharArrayWriter();

core/java/android/net/NetworkStateTracker.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -216,16 +216,6 @@ public interface NetworkStateTracker { 
     */

     */

    public void setDependencyMet(boolean met);

    public void setDependencyMet(boolean met);





    /**

     * Informs the state tracker that another interface is stacked on top of it.

     **/

    public void addStackedLink(LinkProperties link);



    /**

     * Informs the state tracker that a stacked interface has been removed.

     **/

    public void removeStackedLink(LinkProperties link);



    /*

    /*

     * Called once to setup async channel between this and

     * Called once to setup async channel between this and

     * the underlying network specific code.

     * the underlying network specific code.

core/tests/coretests/src/android/net/LinkPropertiesTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -338,14 +338,14 @@ public class LinkPropertiesTest extends TestCase { 
            assertFalse("newname".equals(link.getInterfaceName()));

            assertFalse("newname".equals(link.getInterfaceName()));

        }

        }





        assertTrue(rmnet0.removeStackedLink(clat4));

        assertTrue(rmnet0.removeStackedLink("clat4"));

        assertEquals(0, rmnet0.getStackedLinks().size());

        assertEquals(0, rmnet0.getStackedLinks().size());

        assertEquals(1, rmnet0.getAddresses().size());

        assertEquals(1, rmnet0.getAddresses().size());

        assertEquals(1, rmnet0.getLinkAddresses().size());

        assertEquals(1, rmnet0.getLinkAddresses().size());

        assertEquals(1, rmnet0.getAllAddresses().size());

        assertEquals(1, rmnet0.getAllAddresses().size());

        assertEquals(1, rmnet0.getAllLinkAddresses().size());

        assertEquals(1, rmnet0.getAllLinkAddresses().size());





        assertFalse(rmnet0.removeStackedLink(clat4));

        assertFalse(rmnet0.removeStackedLink("clat4"));

    }

    }





    private LinkAddress getFirstLinkAddress(LinkProperties lp) {

    private LinkAddress getFirstLinkAddress(LinkProperties lp) {
@@ -370,7 +370,7 @@ public class LinkPropertiesTest extends TestCase { 
        assertTrue(stacked.hasGlobalIPv6Address());

        assertTrue(stacked.hasGlobalIPv6Address());

        assertFalse(lp.hasIPv4Address());

        assertFalse(lp.hasIPv4Address());

        assertFalse(lp.hasGlobalIPv6Address());

        assertFalse(lp.hasGlobalIPv6Address());

        lp.removeStackedLink(stacked);

        lp.removeStackedLink("stacked");

        assertFalse(lp.hasIPv4Address());

        assertFalse(lp.hasIPv4Address());

        assertFalse(lp.hasGlobalIPv6Address());

        assertFalse(lp.hasGlobalIPv6Address());