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

Commit 7fa4a40b 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:... 

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

Change-Id: Iab965d53e64058103280437bded53a1a5f5f6db4
parents 783e0b74 ff696e12

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

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

    }





    public void untetherAll() {

    public void untetherAll() {

        synchronized (mPublicSync) {

        stopTethering(ConnectivityManager.TETHERING_WIFI);

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

        stopTethering(ConnectivityManager.TETHERING_USB);

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

        stopTethering(ConnectivityManager.TETHERING_BLUETOOTH);

                untether(mTetherStates.keyAt(i));

            }

        }

    }

    }





    public int getLastTetherError(String iface) {

    public int getLastTetherError(String iface) {