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

This commit is contained in:
TreeHugger Robot
2016-10-01 01:21:35 +00:00
committed by Android (Google) Code Review

View File

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