am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

* commit '49d660ac014c3802aa5e694d745b284fc2b601ae':
  Use TelephonyManager api to get SPN of sim to display in UI.
This commit is contained in:
Sanket Padawe
2015-02-26 23:18:55 +00:00
committed by Android Git Automerger

View File

@@ -365,8 +365,14 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
numberView.setText(PhoneNumberUtils.formatNumber(rawNumber));
}
final TelephonyManager tm =
(TelephonyManager) getActivity().getSystemService(
Context.TELEPHONY_SERVICE);
String simCarrierName = tm.getSimOperatorNameForSubscription(mSubInfoRecord
.getSubscriptionId());
TextView carrierView = (TextView)dialogLayout.findViewById(R.id.carrier);
carrierView.setText(mSubInfoRecord.getCarrierName());
carrierView.setText(!TextUtils.isEmpty(simCarrierName) ? simCarrierName :
getContext().getString(com.android.internal.R.string.unknownName));
builder.setTitle(String.format(res.getString(R.string.sim_editor_title),
(mSubInfoRecord.getSimSlotIndex() + 1)));