am cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0

* commit 'cb5fa5a44779f790fae87102a573816ecc15dd3d':
  Remove wifidirect UI listing
This commit is contained in:
Irfan Sheriff
2011-10-21 14:38:39 -07:00
committed by Android Git Automerger

View File

@@ -51,8 +51,6 @@ public class WirelessSettings extends SettingsPreferenceFragment {
private static final String KEY_PROXY_SETTINGS = "proxy_settings";
private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
private static final int WIFI_P2P_DEBUG = SystemProperties.getInt("ro.debuggable", 0);
public static final String EXIT_ECM_RESULT = "exit_ecm_result";
public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -144,14 +142,10 @@ public class WirelessSettings extends SettingsPreferenceFragment {
if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)) {
getPreferenceScreen().removePreference(wifiP2p);
getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
} else {
mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p);
//Settings is used for debug alone
if (WIFI_P2P_DEBUG == 0) {
}
getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
}
}
// Enable Proxy selector settings if allowed.
Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);