am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev

* commit '111cc9f511dc65006fc2972c9ecbf295619e09b9':
  Change removeStackedLink to take an interface name.

core/java/android/net/BaseNetworkStateTracker.java

@@ -169,16 +169,6 @@ public abstract class BaseNetworkStateTracker implements NetworkStateTracker {
         // 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
     public void supplyMessenger(Messenger messenger) {
         // not supported on this network

core/java/android/net/LinkProperties.java

@@ -493,16 +493,16 @@ public final class LinkProperties implements Parcelable {
     /**
      * 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.
      *
-     * @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.
      * @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 false;

core/java/android/net/MobileDataStateTracker.java

@@ -660,16 +660,6 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker {
         return retVal;
     }
 
-    @Override
-    public void addStackedLink(LinkProperties link) {
-        mLinkProperties.addStackedLink(link);
-    }
-
-    @Override
-    public void removeStackedLink(LinkProperties link) {
-        mLinkProperties.removeStackedLink(link);
-    }
-
     @Override
     public String toString() {
         final CharArrayWriter writer = new CharArrayWriter();

core/java/android/net/NetworkStateTracker.java

@@ -216,16 +216,6 @@ public interface NetworkStateTracker {
      */
     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
      * the underlying network specific code.

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

@@ -338,14 +338,14 @@ public class LinkPropertiesTest extends TestCase {
             assertFalse("newname".equals(link.getInterfaceName()));
         }
 
-        assertTrue(rmnet0.removeStackedLink(clat4));
+        assertTrue(rmnet0.removeStackedLink("clat4"));
         assertEquals(0, rmnet0.getStackedLinks().size());
         assertEquals(1, rmnet0.getAddresses().size());
         assertEquals(1, rmnet0.getLinkAddresses().size());
         assertEquals(1, rmnet0.getAllAddresses().size());
         assertEquals(1, rmnet0.getAllLinkAddresses().size());
 
-        assertFalse(rmnet0.removeStackedLink(clat4));
+        assertFalse(rmnet0.removeStackedLink("clat4"));
     }
 
     private LinkAddress getFirstLinkAddress(LinkProperties lp) {
@@ -370,7 +370,7 @@ public class LinkPropertiesTest extends TestCase {
         assertTrue(stacked.hasGlobalIPv6Address());
         assertFalse(lp.hasIPv4Address());
         assertFalse(lp.hasGlobalIPv6Address());
-        lp.removeStackedLink(stacked);
+        lp.removeStackedLink("stacked");
         assertFalse(lp.hasIPv4Address());
         assertFalse(lp.hasGlobalIPv6Address());
 

services/core/java/com/android/server/connectivity/Nat464Xlat.java

@@ -217,7 +217,7 @@ public class Nat464Xlat extends BaseNetworkObserver {
                 NetworkUtils.resetConnections(
                     CLAT_INTERFACE_NAME,
                     NetworkUtils.RESET_IPV4_ADDRESSES);
-                mBaseLP.removeStackedLink(mLP);
+                mBaseLP.removeStackedLink(CLAT_INTERFACE_NAME);
                 updateConnectivityService();
             }
             Slog.i(TAG, "interface " + CLAT_INTERFACE_NAME +