InCallUI: Use global settings name for MSIM

Change-Id: Iaf0f6f29c61baa04ba42dad1cfa4b14602ef5731

3 files changed, 5 insertions, 13 deletions

diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index 4b67c45c..234ab8e6 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/src/com/android/incallui/CallCardFragment.java
@@ -337,14 +337,13 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
 
         if (tm.isMultiSimEnabled() && !(tm.getMultiSimConfiguration()
                 == MSimTelephonyManager.MultiSimVariants.DSDA)) {
-            final String multiSimName = "perferred_name_sub";
             int subscription = getPresenter().getActiveSubscription();
 
             if ((subscription != -1) && (!isSipCall)
                     && MSimTelephonyManager.getDefault().getSimState(subscription)
                             != TelephonyManager.SIM_STATE_ABSENT) {
-                final String simName = Settings.System.getString(getActivity()
-                        .getContentResolver(), multiSimName + (subscription + 1));
+                final String simName = Settings.Global.getSimNameForSubscription(getActivity(),
+                        subscription, null);
                 showSubscriptionInfo(simName);
             }
         }  else {
diff --git a/src/com/android/incallui/MSimInCallActivity.java b/src/com/android/incallui/MSimInCallActivity.java
index cb2ac5b6..e8c637d1 100644
--- a/src/com/android/incallui/MSimInCallActivity.java
+++ b/src/com/android/incallui/MSimInCallActivity.java
@@ -47,10 +47,6 @@ public class MSimInCallActivity extends InCallActivity {
     private Tab[] mDsdaTab = new Tab[TAB_COUNT_TWO];
     private boolean[] mDsdaTabAdd = {false, false};
 
-    private static final String[] MULTI_SIM_NAME = {
-        "perferred_name_sub1", "perferred_name_sub2"
-    };
-
     @Override
     protected void onCreate(Bundle icicle) {
         Log.d(this, "onCreate()...  this = " + this);
@@ -159,8 +155,7 @@ public class MSimInCallActivity extends InCallActivity {
                         .setBackground(icons.getDrawable(i));
 
                 ((TextView)mDsdaTabLayout[i].findViewById(R.id.tabSubText))
-                        .setText(Settings.System.getString(getContentResolver(),
-                                MULTI_SIM_NAME[i]));
+                        .setText(Settings.Global.getSimNameForSubscription(this, i, null));
             }
             mDsdaTab[i] = bar.newTab().setCustomView(mDsdaTabLayout[i])
                     .setTabListener(new TabListener(i));
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index 7ecd732f..7f4a72a7 100755
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -46,8 +46,6 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
 
     private static final long IN_CALL_TIMEOUT = 1000L;
 
-    private static final String MULTI_SIM_NAME = "perferred_name_sub";
-
     private interface NotificationTimer {
         enum State {
             SCHEDULED,
@@ -333,8 +331,8 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
         String contentText = mContext.getString(contentResId);
         if (contentResId == R.string.notification_dialing) {
             int sub = call.getSubscription();
-            String name = Settings.System.getString(mContext.getContentResolver(),
-                    MULTI_SIM_NAME + (sub + 1));
+            String name = Settings.Global.getSimNameForSubscription(mContext, sub,
+                    String.valueOf(sub));
             contentText +=  "  (" + name + ")";
         }
         builder.setContentText(contentText);