commit ca5cc0152f3fc26f871797dddd6c45cd2d265600
author Robert Greenwalt <rgreenwalt@google.com> Mon Feb 28 09:54:17 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 28 09:54:17 2011 -0800
tree 6fa986ff6d3bad3f4e18b7bab304ab8f708ac81f
parent 26c433c1c64416aed4736bb5a76b0ac4585958a1
parent 29ebf5fa50f1dd44d1a8661f1ddd0134714979b6

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

* commit '29ebf5fa50f1dd44d1a8661f1ddd0134714979b6':
  Just use device configuration for Tethering.

src/com/android/settings/WirelessSettings.java

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 9567c01..b1b7e6e 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -148,7 +148,7 @@
         // 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();