SubscriptionsPreferenceController shows the unique sim description.

Bug: 148303118
Bug: 150370656
Test: atest -c SubscriptionsPreferenceControllerTest
Change-Id: I041536fe0148087a068c6000383b382b0ff4e17c

src/com/android/settings/sim/PreferredSimDialogFragment.java

@@ -30,6 +30,7 @@ import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
 
 /**
  * Presents a dialog asking the user if they want to update all services to use a given "preferred"
@@ -86,7 +87,9 @@ public class PreferredSimDialogFragment extends SimDialogFragment implements
             return;
         }
         final String message =
-                getContext().getString(R.string.sim_preferred_message, info.getDisplayName());
+                getContext().getString(
+                        R.string.sim_preferred_message,
+                        SubscriptionUtil.getUniqueSubscriptionDisplayName(info, getContext()));
         dialog.setMessage(message);
     }
 

src/com/android/settings/sim/SimActivationNotifier.java

@@ -117,10 +117,12 @@ public class SimActivationNotifier {
             return;
         }
 
+        CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                activeRemovableSub, mContext);
         String carrierName =
-                TextUtils.isEmpty(activeRemovableSub.getDisplayName())
+                TextUtils.isEmpty(displayName)
                         ? mContext.getString(R.string.sim_card_label)
-                        : activeRemovableSub.getDisplayName().toString();
+                        : displayName.toString();
         String title =
                 mContext.getString(
                         R.string.post_dsds_reboot_notification_title_with_carrier, carrierName);

src/com/android/settings/sim/SimListDialogFragment.java

@@ -38,6 +38,7 @@ import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.network.SubscriptionUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -179,7 +180,7 @@ public class SimListDialogFragment extends SimDialogFragment implements
                 icon.setImageTintList(
                         Utils.getColorAttr(mContext, android.R.attr.textColorSecondary));
             } else {
-                title.setText(sub.getDisplayName());
+                title.setText(SubscriptionUtil.getUniqueSubscriptionDisplayName(sub, mContext));
                 summary.setText(isMdnProvisioned(sub.getNumber()) ? sub.getNumber() : "");
                 icon.setImageBitmap(sub.createIconBitmap(mContext));
 

src/com/android/settings/sim/SimSelectNotification.java

@@ -139,7 +139,8 @@ public class SimSelectNotification extends BroadcastReceiver {
         }
 
         CharSequence notificationSummary = context.getResources().getString(
-                R.string.enable_mms_notification_summary, SubscriptionUtil.getDisplayName(info));
+                R.string.enable_mms_notification_summary,
+                SubscriptionUtil.getUniqueSubscriptionDisplayName(info, context));
 
         cancelEnableMmsNotification(context);