am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"

* commit 'd61c23b3c20e990c34edfa5b257f558d479218cf':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
This commit is contained in:
Jean-Baptiste Queru
2012-08-17 08:55:51 -07:00
committed by Android Git Automerger

View File

@@ -493,8 +493,8 @@ public class TetherSettings extends SettingsPreferenceFragment
private void setUsbTethering(boolean enabled) {
ConnectivityManager cm =
(ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
mUsbTether.setChecked(false);
if (cm.setUsbTethering(enabled) != ConnectivityManager.TETHER_ERROR_NO_ERROR) {
mUsbTether.setChecked(false);
mUsbTether.setSummary(R.string.usb_tethering_errored_subtext);
return;
}