commit a2f699871eb01c6d8464699eb8808c33de15f438
author PauloftheWest <paulofthewest@google.com> Mon Dec 08 17:01:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 08 17:01:23 2014 +0000
tree cc84a3f7f2047261e3cc3c4871583ba9c7feefdf
parent f68bc6459352cf585b2cbb1c9e0c9b54e1936daa
parent e51465254d4adf4095e9e2e005cca8e0f7a57931

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

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

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index f993b8a..450ffff 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -212,9 +212,8 @@
                 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 @@
         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);