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

Commit a2f69987 authored by PauloftheWest's avatar PauloftheWest Committed by Android (Google) Code Review
Browse files

Merge "Fixed a SimSettings issue" into lmp-mr1-dev

parents f68bc645 e5146525

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

+3 −6
Original line number Diff line number Diff line
@@ -212,9 +212,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
                mSubscriptionManager.getDefaultSmsSubId());

        simPref.setTitle(R.string.sms_messages_title);

        if (DBG) log("[updateSmsValues] mSubInfoList=" + mSubInfoList);

        if (mSubInfoList != null && mSubInfoList.size() == 1) {

            simPref.setSummary(mSubInfoList.get(0).getDisplayName());

        } else if (sir != null) {



        if (sir != null) {

            simPref.setSummary(sir.getDisplayName());

        } else if (sir == null) {

            simPref.setSummary(R.string.sim_selection_required_pref);
@@ -229,9 +228,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
        simPref.setTitle(R.string.cellular_data_title);

        if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList);



        if (mSubInfoList != null && mSubInfoList.size() == 1) {

            simPref.setSummary(mSubInfoList.get(0).getDisplayName());

        } else if (sir != null) {

        if (sir != null) {

            simPref.setSummary(sir.getDisplayName());

        } else if (sir == null) {

            simPref.setSummary(R.string.sim_selection_required_pref);