From e51465254d4adf4095e9e2e005cca8e0f7a57931 Mon Sep 17 00:00:00 2001 From: PauloftheWest Date: Wed, 3 Dec 2014 10:16:52 -0800 Subject: [PATCH] Fixed a SimSettings issue + SimSettings will not automatically select the first SIM for the user. Bug: 18528013 Change-Id: I4c2024860231f6124a801feda821bc16bc2c4772 --- src/com/android/settings/sim/SimSettings.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 69dbbe087b1..0fe024b2e56 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -210,9 +210,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); @@ -227,9 +226,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);