diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-09-27 13:10:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-27 13:10:47 -0700 |
| commit | df5ab21d21fac3107fed231d4469e5bc26a089f6 (patch) | |
| tree | 0b795a0d043e1ace565d175edaec9e8d170705d1 /src/com/android/settings/deviceinfo | |
| parent | 522b074bdae89737ee4ac8580a8c939f257f3f3a (diff) | |
| parent | ae69755aa874dbac77e9874d9716ab891a144193 (diff) | |
| download | packages_apps_settings-df5ab21d21fac3107fed231d4469e5bc26a089f6.zip packages_apps_settings-df5ab21d21fac3107fed231d4469e5bc26a089f6.tar.gz packages_apps_settings-df5ab21d21fac3107fed231d4469e5bc26a089f6.tar.bz2 | |
am ae69755a: Disable USB connection type when monkeys are running.
* commit 'ae69755aa874dbac77e9874d9716ab891a144193':
Disable USB connection type when monkeys are running.
Diffstat (limited to 'src/com/android/settings/deviceinfo')
| -rw-r--r-- | src/com/android/settings/deviceinfo/UsbSettings.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java index 44ecff4..af279e8 100644 --- a/src/com/android/settings/deviceinfo/UsbSettings.java +++ b/src/com/android/settings/deviceinfo/UsbSettings.java @@ -34,6 +34,7 @@ import android.util.Log; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.Utils; /** * USB storage settings. @@ -110,6 +111,11 @@ public class UsbSettings extends SettingsPreferenceFragment { @Override public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { + // Don't allow any changes to take effect as the USB host will be disconnected, killing + // the monkeys + if (Utils.isMonkeyRunning()) { + return true; + } // temporary hack - using check boxes as radio buttons // don't allow unchecking them if (preference instanceof CheckBoxPreference) { |