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

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

Merge "Implement untetherAll as calls to stopTethering" am: 7fd48d54 am: bce303a0 

am: 9215efd1

Change-Id: If33c9605aa0a1af08401ab9b6dd011decf1ec4ca
parents 9c933d43 9215efd1

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) {