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

This commit is contained in:
Sanket Padawe
2014-12-03 01:32:26 +00:00
committed by Android (Google) Code Review

View File

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