am 827ef6e0: Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev

* commit '827ef6e0bd696b2cd0ff8d2bf28e4564b913c345':
  Add stacking to the NetworkStateTrackers.

core/java/android/bluetooth/BluetoothTetheringDataTracker.java

@@ -373,4 +373,14 @@ public class BluetoothTetheringDataTracker implements NetworkStateTracker {
     public void setDependencyMet(boolean met) {
         // not supported on this network
     }
+
+    @Override
+    public void addStackedLink(LinkProperties link) {
+        mLinkProperties.addStackedLink(link);
+    }
+
+    @Override
+    public void removeStackedLink(LinkProperties link) {
+        mLinkProperties.removeStackedLink(link);
+    }
 }

core/java/android/net/BaseNetworkStateTracker.java

@@ -155,4 +155,14 @@ public abstract class BaseNetworkStateTracker implements NetworkStateTracker {
     public void setDependencyMet(boolean met) {
         // Base tracker doesn't handle dependencies
     }
+
+    @Override
+    public void addStackedLink(LinkProperties link) {
+        mLinkProperties.addStackedLink(link);
+    }
+
+    @Override
+    public void removeStackedLink(LinkProperties link) {
+        mLinkProperties.removeStackedLink(link);
+    }
 }

core/java/android/net/DummyDataStateTracker.java

@@ -203,6 +203,16 @@ public class DummyDataStateTracker implements NetworkStateTracker {
         // not supported on this network
     }
 
+    @Override
+    public void addStackedLink(LinkProperties link) {
+        mLinkProperties.addStackedLink(link);
+    }
+
+    @Override
+    public void removeStackedLink(LinkProperties link) {
+        mLinkProperties.removeStackedLink(link);
+    }
+
     static private void log(String s) {
         Slog.d(TAG, s);
     }

core/java/android/net/EthernetDataTracker.java

@@ -407,4 +407,14 @@ public class EthernetDataTracker implements NetworkStateTracker {
     public void setDependencyMet(boolean met) {
         // not supported on this network
     }
+
+    @Override
+    public void addStackedLink(LinkProperties link) {
+        mLinkProperties.addStackedLink(link);
+    }
+
+    @Override
+    public void removeStackedLink(LinkProperties link) {
+        mLinkProperties.removeStackedLink(link);
+    }
 }

core/java/android/net/MobileDataStateTracker.java

@@ -521,6 +521,16 @@ public class MobileDataStateTracker implements NetworkStateTracker {
         }
     }
 
+    @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

@@ -197,4 +197,14 @@ public interface NetworkStateTracker {
      * An external dependency has been met/unmet
      */
     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);
 }

wifi/java/android/net/wifi/WifiStateTracker.java

@@ -252,4 +252,14 @@ public class WifiStateTracker implements NetworkStateTracker {
     public void setDependencyMet(boolean met) {
         // not supported on this network
     }
+
+    @Override
+    public void addStackedLink(LinkProperties link) {
+        mLinkProperties.addStackedLink(link);
+    }
+
+    @Override
+    public void removeStackedLink(LinkProperties link) {
+        mLinkProperties.removeStackedLink(link);
+    }
 }