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

am 37a0c07b: Merge "Fixed crash in sim settings due to wrong toString() call." into lmp-mr1-dev

Browse Source 
* commit '37a0c07b9b73b8d99c43cfdce2bd0b78fdec2a2a':
  Fixed crash in sim settings due to wrong toString() call.
This commit is contained in:
Sanket Padawe
2014-12-03 02:29:03 +00:00
committed by Android Git Automerger
parent 9e878b1b3a 37a0c07b9b
commit 408f0a2954
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,11 +450,11 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
setTitle(String.format(getResources() setTitle(String.format(getResources()
.getString(R.string.sim_editor_title), (mSlotId + 1))); .getString(R.string.sim_editor_title), (mSlotId + 1)));
if (mSubInfoRecord != null) { if (mSubInfoRecord != null) {
if (TextUtils.isEmpty(mSubInfoRecord.getNumber().toString())) { if (TextUtils.isEmpty(mSubInfoRecord.getNumber())) {
setSummary(mSubInfoRecord.getDisplayName()); setSummary(mSubInfoRecord.getDisplayName());
} else { } else {
setSummary(mSubInfoRecord.getDisplayName() + " - " + setSummary(mSubInfoRecord.getDisplayName() + " - " +
mSubInfoRecord.getNumber().toString()); mSubInfoRecord.getNumber());
setEnabled(true); setEnabled(true);
} }
setIcon(new BitmapDrawable(res, (mSubInfoRecord.createIconBitmap(mContext)))); setIcon(new BitmapDrawable(res, (mSubInfoRecord.createIconBitmap(mContext))));