Default sim name set to carrier name in sim settings

Default sim name in SIM settings UI should be carrier name untill user
specifies a name for SIM.

Bug: 17732079
Change-Id: I302ad00095fd06b393dbe358b135f031390a3678

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index aa094d8..e1272ff 100644 (file)
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -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();
                 }