Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd5b0233 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

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

* commit 'cb5fa5a4':
  Remove wifidirect UI listing
parents 31373a62 cb5fa5a4

src/com/android/settings/WirelessSettings.java

+1 −7
Original line number Diff line number Diff line
@@ -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));

            }

        }

        getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));



        // Enable Proxy selector settings if allowed.

        Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);