am 29ebf5fa: Merge "Just use device configuration for Tethering." into honeycomb

* commit '29ebf5fa50f1dd44d1a8661f1ddd0134714979b6':
  Just use device configuration for Tethering.
This commit is contained in:
Robert Greenwalt
2011-02-28 09:54:17 -08:00
committed by Android Git Automerger

View File

@@ -148,7 +148,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
// Disable Tethering if it's not allowed or if it's a wifi-only device
ConnectivityManager cm =
(ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE);
if (!cm.isTetheringSupported() || Utils.isWifiOnly()) {
if (!cm.isTetheringSupported()) {
getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS));
} else {
String[] usbRegexs = cm.getTetherableUsbRegexs();