PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 743e8259: am a2f69987: Merge "Fixed a SimSettings issue" into lmp-mr1-dev

Browse Source 
* commit '743e825934829be58027afac88c5ab8810c5b29b':
  Fixed a SimSettings issue
This commit is contained in:
PauloftheWest
2014-12-08 19:43:57 +00:00
committed by Android Git Automerger
parent d88871564f 743e825934
commit 6f55eb72f4
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/sim/SimSettings.java
View File

@@ -212,9 +212,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
mSubscriptionManager.getDefaultSmsSubId()); mSubscriptionManager.getDefaultSmsSubId());
simPref.setTitle(R.string.sms_messages_title); simPref.setTitle(R.string.sms_messages_title);
if (DBG) log("[updateSmsValues] mSubInfoList=" + mSubInfoList); if (DBG) log("[updateSmsValues] mSubInfoList=" + mSubInfoList);
if (mSubInfoList != null && mSubInfoList.size() == 1) {
simPref.setSummary(mSubInfoList.get(0).getDisplayName()); if (sir != null) {
} else if (sir != null) {
simPref.setSummary(sir.getDisplayName()); simPref.setSummary(sir.getDisplayName());
} else if (sir == null) { } else if (sir == null) {
simPref.setSummary(R.string.sim_selection_required_pref); 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); simPref.setTitle(R.string.cellular_data_title);
if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList); if (DBG) log("[updateCellularDataValues] mSubInfoList=" + mSubInfoList);
if (mSubInfoList != null && mSubInfoList.size() == 1) { if (sir != null) {
simPref.setSummary(mSubInfoList.get(0).getDisplayName());
} else if (sir != null) {
simPref.setSummary(sir.getDisplayName()); simPref.setSummary(sir.getDisplayName());
} else if (sir == null) { } else if (sir == null) {
simPref.setSummary(R.string.sim_selection_required_pref); simPref.setSummary(R.string.sim_selection_required_pref);