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

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

Merge "Add stacking to the NetworkStateTrackers." into jb-mr2-dev

parents 8d0e2618 69edd64d

core/java/android/bluetooth/BluetoothTetheringDataTracker.java

+10 −0
Original line number Diff line number Diff line
@@ -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

+10 −0
Original line number Diff line number Diff line
@@ -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

+10 −0
Original line number Diff line number Diff line
@@ -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

+10 −0
Original line number Diff line number Diff line
@@ -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

+10 −0
Original line number Diff line number Diff line
@@ -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();