summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-17 08:51:14 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-17 08:51:14 -0700
commitd61c23b3c20e990c34edfa5b257f558d479218cf (patch)
treecabd55454da78f97af2129b9039944b243a6a6f2 /src
parent5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba (diff)
parent83397eab96d95fbf6443e17c556e30d54cfa88da (diff)
downloadpackages_apps_Settings-d61c23b3c20e990c34edfa5b257f558d479218cf.zip
packages_apps_Settings-d61c23b3c20e990c34edfa5b257f558d479218cf.tar.gz
packages_apps_Settings-d61c23b3c20e990c34edfa5b257f558d479218cf.tar.bz2
Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/TetherSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 77a72a7..4a79eca 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -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;
}