Merge "Implement untetherAll as calls to stopTethering" am: 7fd48d54de am: bce303a050

am: 9215efd10c

Change-Id: If33c9605aa0a1af08401ab9b6dd011decf1ec4ca
This commit is contained in:
Christopher Wiley
2016-09-27 14:19:40 +00:00
committed by android-build-merger

View File

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