Merge "Just use device configuration for Tethering." into honeycomb
This commit is contained in:
committed by
Android (Google) Code Review
commit
29ebf5fa50
@@ -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();
|
||||||
|
Reference in New Issue
Block a user