diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-01-09 16:37:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-09 16:37:34 -0800 |
| commit | 201896e9838c067102b5ec10f883d84e75ed276c (patch) | |
| tree | de85ca94b906bc4731c82c06ea23823689335e46 /src/com/android/settings/TetherSettings.java | |
| parent | 83b9613395305653290f4236989fc60313ec93ac (diff) | |
| parent | 79ffc669173325e62fdb9f5a1f96fe2a5c3c230b (diff) | |
| download | packages_apps_settings-201896e9838c067102b5ec10f883d84e75ed276c.zip packages_apps_settings-201896e9838c067102b5ec10f883d84e75ed276c.tar.gz packages_apps_settings-201896e9838c067102b5ec10f883d84e75ed276c.tar.bz2 | |
am 79ffc669: am aaff44c8: Don\'t allow wifi tethering when running monkeys.
* commit '79ffc669173325e62fdb9f5a1f96fe2a5c3c230b':
Don't allow wifi tethering when running monkeys.
Diffstat (limited to 'src/com/android/settings/TetherSettings.java')
| -rw-r--r-- | src/com/android/settings/TetherSettings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index d6f6ab6..a7621db 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -148,7 +148,7 @@ public class TetherSettings extends SettingsPreferenceFragment getPreferenceScreen().removePreference(mUsbTether); } - if (wifiAvailable) { + if (wifiAvailable && !Utils.isMonkeyRunning()) { mWifiApEnabler = new WifiApEnabler(activity, mEnableWifiAp); initWifiTethering(); } else { |