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

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

am 8a234809: Merge "Use BaseNetworkObserver in Tethering." 

* commit '8a234809':
  Use BaseNetworkObserver in Tethering.
parents 5cd1a87a 8a234809

services/java/com/android/server/connectivity/Tethering.java

+2 −9
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.internal.util.IState; 
import com.android.internal.util.State;

import com.android.internal.util.StateMachine;

import com.android.server.IoThread;

import com.android.server.net.BaseNetworkObserver;

import com.google.android.collect.Lists;



import java.io.FileDescriptor;
@@ -70,7 +71,7 @@ import java.util.Set; 
 *

 * TODO - look for parent classes and code sharing

 */

public class Tethering extends INetworkManagementEventObserver.Stub {

public class Tethering extends BaseNetworkObserver {



    private Context mContext;

    private final static String TAG = "Tethering";
@@ -315,14 +316,6 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
        }

    }



    public void addressUpdated(String address, String iface, int flags, int scope) {}



    public void addressRemoved(String address, String iface, int flags, int scope) {}



    public void limitReached(String limitName, String iface) {}



    public void interfaceClassDataActivityChanged(String label, boolean active) {}



    public int tether(String iface) {

        if (DBG) Log.d(TAG, "Tethering " + iface);

        TetherInterfaceSM sm = null;