am 6215d8dd: Default sim name set to carrier name in sim settings automerge: 745046c automerge: 8d60883

* commit '6215d8dda9a94bb7dcacb483b3a26cdd39e299eb':
  Default sim name set to carrier name in sim settings
This commit is contained in:
Sanket Padawe
2014-10-25 02:35:52 +00:00
committed by Android Git Automerger

View File

@@ -479,6 +479,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
if (mSubInfoRecord != null) {
if(TextUtils.isEmpty(mSubInfoRecord.displayName)) {
setTitle(getCarrierName());
mSubInfoRecord.displayName = getCarrierName();
SubscriptionManager.setDisplayName(getCarrierName(), mSubInfoRecord.subId);
} else {
setTitle(mSubInfoRecord.displayName);
}
@@ -546,6 +548,9 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
SubscriptionManager.setDisplayName(mSubInfoRecord.displayName,
mSubInfoRecord.subId);
findRecordBySubId(mSubInfoRecord.subId).displayName =
nameText.getText().toString();
updateAllOptions();
update();
}