summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-17 08:55:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-17 08:55:51 -0700
commitf4cc034e8c61a05b3e99ca4f698b3fe6de21bc98 (patch)
treeb9a569a5f2ffd071e0495dbb5aaf2f9b2d25f6e5
parent8543723f37f6f8c42562e13d0ecaeeaa3a2d3e41 (diff)
parentd61c23b3c20e990c34edfa5b257f558d479218cf (diff)
downloadpackages_apps_Settings-f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98.zip
packages_apps_Settings-f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98.tar.gz
packages_apps_Settings-f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98.tar.bz2
am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit 'd61c23b3c20e990c34edfa5b257f558d479218cf': TetheringSetting: Keep Tethering checkbox unchecked until tethering up
-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;
}