summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-17 08:57:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-17 08:57:03 -0700
commit43231f2d6edef60859ffd3d92d43afe48f5916f6 (patch)
tree8b1ee02e5e29d6328ee8db0fed8ac8ba7fc72ec9 /src/com/android
parentc8cd7d9335863d19a0a37569a4a539f13ebd1858 (diff)
parentf4cc034e8c61a05b3e99ca4f698b3fe6de21bc98 (diff)
downloadpackages_apps_settings-43231f2d6edef60859ffd3d92d43afe48f5916f6.zip
packages_apps_settings-43231f2d6edef60859ffd3d92d43afe48f5916f6.tar.gz
packages_apps_settings-43231f2d6edef60859ffd3d92d43afe48f5916f6.tar.bz2
am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit 'f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98': TetheringSetting: Keep Tethering checkbox unchecked until tethering up
Diffstat (limited to 'src/com/android')
-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 368973c..ce53550 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -497,8 +497,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;
}