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

Commit d763b6df authored by Abhishek Gilra's avatar Abhishek Gilra Committed by Gerrit Code Review
Browse files

Adding null checks to prevent OnPrepareRemoval() on null object 

Adding NULL checks to parameters being sent with removePreference.
Issue-Id: YAM-107

Change-Id: I1ade95b0eb6b9a7e01df84ebba974a4d5224cfd8
parent b3857899

src/com/android/settings/WirelessSettings.java

+6 −4
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ public class WirelessSettings extends SettingsPreferenceFragment 
        }



        // Remove NSD checkbox by default

        getPreferenceScreen().removePreference(nsd);

        if (nsd != null) getPreferenceScreen().removePreference(nsd);

        //mNsdEnabler = new NsdEnabler(activity, nsd);



        String toggleable = Settings.Global.getString(activity.getContentResolver(),
@@ -336,12 +336,14 @@ public class WirelessSettings extends SettingsPreferenceFragment 
        // Remove NFC if not available

        mNfcAdapter = NfcAdapter.getDefaultAdapter(activity);

        if (mNfcAdapter == null) {

            getPreferenceScreen().removePreference(nfcCategory);

            if (nfcCategory != null) getPreferenceScreen().removePreference(nfcCategory);

            mNfcEnabler = null;

        } else if (!mPm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {

            // Only show if we have the HCE feature

            if ((nfcCategory != null) && (nfcPayment != null)) {

                nfcCategory.removePreference(nfcPayment);

            }

        }



        // Remove Mobile Network Settings and Manage Mobile Plan for secondary users,

        // if it's a wifi-only device, or if the settings are restricted.
@@ -376,7 +378,7 @@ public class WirelessSettings extends SettingsPreferenceFragment 
        final DevicePolicyManager mDPM = (DevicePolicyManager)

                activity.getSystemService(Context.DEVICE_POLICY_SERVICE);

        // proxy UI disabled until we have better app support

        getPreferenceScreen().removePreference(mGlobalProxy);

        if (mGlobalProxy != null) getPreferenceScreen().removePreference(mGlobalProxy);

        mGlobalProxy.setEnabled(mDPM.getGlobalProxyAdmin() == null);



        // Disable Tethering if it's not allowed or if it's a wifi-only device