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

Commit fee635cc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Implement untetherAll as calls to stopTethering" into nyc-mr1-dev

parents a6afc56f fa6a4866

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

+3 −6
Original line number Diff line number Diff line
@@ -626,12 +626,9 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering 
    }



    public void untetherAll() {

        synchronized (mPublicSync) {

            if (DBG) Log.d(TAG, "Untethering " + mTetherStates.keySet());

            for (int i = 0; i < mTetherStates.size(); i++) {

                untether(mTetherStates.keyAt(i));

            }

        }

        stopTethering(ConnectivityManager.TETHERING_WIFI);

        stopTethering(ConnectivityManager.TETHERING_USB);

        stopTethering(ConnectivityManager.TETHERING_BLUETOOTH);

    }



    public int getLastTetherError(String iface) {