PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 26c433c1c6 29ebf5fa50
commit ca5cc0152f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/WirelessSettings.java
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 // Disable Tethering if it's not allowed or if it's a wifi-only device
ConnectivityManager cm = ConnectivityManager cm =
(ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE); (ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE);
if (!cm.isTetheringSupported() || Utils.isWifiOnly()) { if (!cm.isTetheringSupported()) {
getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS)); getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS));
} else { } else {
String[] usbRegexs = cm.getTetherableUsbRegexs(); String[] usbRegexs = cm.getTetherableUsbRegexs();