diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-03-03 12:15:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-03 12:15:08 -0800 |
| commit | 65daa5f593a2ed59805a629cba4767ae89771bc8 (patch) | |
| tree | 401c8c97b0961714a9ef750859501d30b80d7bf3 /src/com | |
| parent | 628f9b3889a73872131681eaf4bbd4c41f56a0be (diff) | |
| parent | 26dad3ecef45ffb75178fc2fe184307089815510 (diff) | |
| download | packages_apps_settings-65daa5f593a2ed59805a629cba4767ae89771bc8.zip packages_apps_settings-65daa5f593a2ed59805a629cba4767ae89771bc8.tar.gz packages_apps_settings-65daa5f593a2ed59805a629cba4767ae89771bc8.tar.bz2 | |
Merge "Disable tethering checkbox when USB mass storage is active."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/TetherSettings.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index 1e9c4e2..b9e266a 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; +import android.os.Environment; import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceScreen; @@ -89,6 +90,8 @@ public class TetherSettings extends PreferenceActivity { Settings.Secure.TETHER_NOTIFY, 0) != 0); IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED); + filter.addAction(Intent.ACTION_MEDIA_SHARED); + filter.addAction(Intent.ACTION_MEDIA_UNSHARED); mTetherChangeReceiver = new TetherChangeReceiver(); Intent intent = registerReceiver(mTetherChangeReceiver, filter); @@ -107,6 +110,8 @@ public class TetherSettings extends PreferenceActivity { boolean usbAvailable = false; boolean wifiTethered = false; boolean wifiAvailable = false; + boolean massStorageActive = + Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState()); for (String s : available) { for (String regex : mUsbRegexs) { @@ -128,6 +133,9 @@ public class TetherSettings extends PreferenceActivity { if (usbTethered) { mUsbTether.setSummary(R.string.usb_tethering_active_subtext); mUsbTether.setEnabled(true); + } else if (massStorageActive) { + mUsbTether.setSummary(R.string.usb_tethering_storage_active_subtext); + mUsbTether.setEnabled(false); } else if (usbAvailable) { mUsbTether.setSummary(R.string.usb_tethering_available_subtext); mUsbTether.setEnabled(true); |