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

Commit bce303a0 authored by Christopher Wiley's avatar Christopher Wiley Committed by android-build-merger
Browse files

Merge "Implement untetherAll as calls to stopTethering" 

am: 7fd48d54

Change-Id: I35eda039f92836a9216bfed93b8fc2c39a434a3c
parents 8d7e3b02 7fd48d54

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

+3 −6
Original line number Diff line number Diff line
@@ -625,12 +625,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) {