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

Commit 2fa2dc49 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Add NPE protection for the bundle"

parents 01afa396 a3ba1831

src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ public class EnabledNetworkModePreferenceController extends 
        void setPreferenceEntries() {

            mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);

            final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(mSubId);

            final boolean display2gOptions = carrierConfig

                    .getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL);

            final boolean display2gOptions = carrierConfig != null

                    && carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL);

            clearAllEntries();

            UiOptions.Builder uiOptions = UiOptions.newBuilder();

            uiOptions.setType(getEnabledNetworkType());