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

Commit 8725026e authored by Stuart Scott's avatar Stuart Scott Committed by jianzhou
Browse files

Fix NPE when parceling SubInfoRecord 

bug:18256375

Conflicts:
	src/com/android/settings/sim/SimSettings.java

Change-Id: I04ab5086e3f06abc6ce44ef69501022564a95b88
parent 13705e4c

src/com/android/settings/sim/SimSettings.java

+11 −3
Original line number Diff line number Diff line
@@ -684,9 +684,17 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
            final Resources res = getResources();



            setTitle(res.getString(R.string.sim_card_number_title, mSlotId + 1));

            if (mSubscriptionInfo != null) {

                setSummary(res.getString(R.string.sim_settings_summary,

                            mSubscriptionInfo.getDisplayName(), mSubscriptionInfo.getNumber()));

            if (mSubInfoRecord != null) {

                if(TextUtils.isEmpty(mSubInfoRecord.getDisplayName())) {

                    setTitle(getCarrierName());

                    String displayName = getCarrierName();

                    mSubInfoRecord.setDisplayName(displayName);

                    SubscriptionManager.setDisplayName(displayName,

                            mSubInfoRecord.getSubscriptionId());

                } else {

                    setTitle(mSubInfoRecord.getDisplayName());

                }

                setSummary(mSubInfoRecord.getNumber());

                setEnabled(true);

            } else {

                setSummary(R.string.sim_slot_empty);