am 65ea49a2: am 74924424: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: ac61828

* commit '65ea49a2fb8363dd57ac2d881a4c34af70e07c7c':
  Fix NPE when parceling SubInfoRecord
This commit is contained in:
Stuart Scott
2014-11-06 21:08:03 +00:00
committed by Android Git Automerger

View File

@@ -485,7 +485,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
} else { } else {
setTitle(mSubInfoRecord.getDisplayName()); setTitle(mSubInfoRecord.getDisplayName());
} }
setSummary(mSubInfoRecord.getNumber().toString()); setSummary(mSubInfoRecord.getNumber());
setEnabled(true); setEnabled(true);
} else { } else {
setSummary(R.string.sim_slot_empty); setSummary(R.string.sim_slot_empty);