SubscriptionsPreferenceController shows the unique sim description.

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

src/com/android/settings/IccLockSettings.java

@@ -56,6 +56,7 @@ import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
 import com.android.settings.network.ProxySubscriptionManager;
+import com.android.settings.network.SubscriptionUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -310,7 +311,8 @@ public class IccLockSettings extends SettingsPreferenceFragment
                 mTabHost.addTab(buildTabSpec(tag,
                         String.valueOf(subInfo == null
                                 ? getContext().getString(R.string.sim_editor_title, slot + 1)
-                                : subInfo.getDisplayName())));
+                                : SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                                        subInfo, getContext()))));
             }
 
             mTabHost.setCurrentTabByTag(getTagForSlotId(mSlotId));

src/com/android/settings/ResetNetwork.java

@@ -47,6 +47,7 @@ import androidx.annotation.VisibleForTesting;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.ConfirmLockPattern;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -194,7 +195,8 @@ public class ResetNetwork extends InstrumentedFragment {
                     // Set the first selected value to the default
                     selectedIndex = subscriptionNames.size();
                 }
-                String name = record.getDisplayName().toString();
+                String name = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                        record, getContext()).toString();
                 if (TextUtils.isEmpty(name)) {
                     name = record.getNumber();
                 }

src/com/android/settings/datausage/CellDataPreference.java

@@ -36,6 +36,7 @@ import androidx.preference.PreferenceViewHolder;
 import com.android.settings.R;
 import com.android.settings.network.MobileDataEnabledListener;
 import com.android.settings.network.ProxySubscriptionManager;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.CustomDialogPreferenceCompat;
 
@@ -200,12 +201,14 @@ public class CellDataPreference extends CustomDialogPreferenceCompat
 
         final String previousName = (nextSir == null)
             ? getContext().getResources().getString(R.string.sim_selection_required_pref)
-            : nextSir.getDisplayName().toString();
+                : SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                        nextSir, getContext()).toString();
 
         builder.setTitle(R.string.sim_change_data_title);
         builder.setMessage(getContext().getString(R.string.sim_change_data_message,
-                String.valueOf(currentSir != null ? currentSir.getDisplayName() : null),
+                String.valueOf(currentSir != null
-                previousName));
+                    ? SubscriptionUtil.getUniqueSubscriptionDisplayName(currentSir, getContext())
+                    : null), previousName));
 
         builder.setPositiveButton(R.string.okay, listener);
         builder.setNegativeButton(R.string.cancel, null);

src/com/android/settings/datausage/DataUsageSummary.java

@@ -35,6 +35,7 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 import com.android.settings.datausage.lib.DataUsageLib;
 import com.android.settings.network.ProxySubscriptionManager;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settingslib.NetworkPolicyEditor;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -170,9 +171,11 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
         category.setTemplate(DataUsageLib.getMobileTemplate(getContext(), subId),
                 subId, services);
         category.pushTemplates(services);
-        if (subInfo != null && !TextUtils.isEmpty(subInfo.getDisplayName())) {
+        final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                subInfo, getContext());
+        if (subInfo != null && !TextUtils.isEmpty(displayName)) {
             Preference title  = category.findPreference(KEY_MOBILE_USAGE_TITLE);
-            title.setTitle(subInfo.getDisplayName());
+            title.setTitle(displayName);
         }
     }
 

src/com/android/settings/network/MobileNetworkListController.java

@@ -26,6 +26,12 @@ import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.util.ArrayMap;
 
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.network.telephony.MobileNetworkActivity;
@@ -35,12 +41,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
 import java.util.List;
 import java.util.Map;
 
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 /**
  * This populates the entries on a page which lists all available mobile subscriptions. Each entry
  * has the name of the subscription with some subtext giving additional detail, and clicking on the
@@ -106,7 +106,9 @@ public class MobileNetworkListController extends AbstractPreferenceController im
                 pref = new Preference(mPreferenceScreen.getContext());
                 mPreferenceScreen.addPreference(pref);
             }
-            pref.setTitle(info.getDisplayName());
+            final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                    info, mContext);
+            pref.setTitle(displayName);
 
             if (info.isEmbedded()) {
                 if (mSubscriptionManager.isActiveSubscriptionId(subId)) {
@@ -121,7 +123,7 @@ public class MobileNetworkListController extends AbstractPreferenceController im
                     pref.setSummary(mContext.getString(R.string.mobile_network_inactive_sim));
                 } else {
                     pref.setSummary(mContext.getString(R.string.mobile_network_tap_to_activate,
-                            SubscriptionUtil.getDisplayName(info)));
+                            displayName));
                 }
             }
 

src/com/android/settings/network/MobileNetworkSummaryController.java

@@ -116,13 +116,14 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
             return null;
         } else if (subs.size() == 1) {
             final SubscriptionInfo info = subs.get(0);
+            final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                    info, mContext);
             final int subId = info.getSubscriptionId();
             if (!info.isEmbedded() && !mSubscriptionManager.isActiveSubscriptionId(subId)
                     && !SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager)) {
-                return mContext.getString(R.string.mobile_network_tap_to_activate,
+                return mContext.getString(R.string.mobile_network_tap_to_activate, displayName);
-                        SubscriptionUtil.getDisplayName(info));
             } else {
-                return subs.get(0).getDisplayName();
+                return displayName;
             }
         } else {
             if (com.android.settings.Utils.isProviderModelEnabled(mContext)) {
@@ -135,8 +136,9 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
     }
 
     private CharSequence getSummaryForProviderModel(List<SubscriptionInfo> subs) {
-        return String.join(", ", subs.stream().map(SubscriptionInfo::getDisplayName)
+        return String.join(", ", subs.stream().map(subInfo -> {
-                .collect(Collectors.toList()));
+            return SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, mContext);
+        }).collect(Collectors.toList()));
     }
 
     private void startAddSimFlow() {

src/com/android/settings/network/NetworkProviderCallsSmsController.java

@@ -91,20 +91,22 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
             final StringBuilder summary = new StringBuilder();
             for (SubscriptionInfo subInfo : subs) {
                 int subsSize = subs.size();
+                final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                        subInfo, mContext);
 
                 // Set displayName as summary if there is only one valid SIM.
                 if (subsSize == 1
                         && SubscriptionManager.isValidSubscriptionId(subInfo.getSubscriptionId())) {
-                    return subInfo.getDisplayName();
+                    return displayName;
                 }
 
                 CharSequence status = getPreferredStatus(subInfo);
                 if (status.toString().isEmpty()) {
                     // If there are 2 or more SIMs and one of these has no preferred status,
                     // set only its displayName as summary.
-                    summary.append(subInfo.getDisplayName());
+                    summary.append(displayName);
                 } else {
-                    summary.append(subInfo.getDisplayName())
+                    summary.append(displayName)
                             .append(" (")
                             .append(status)
                             .append(")");

src/com/android/settings/network/ProviderModelSliceHelper.java

@@ -261,7 +261,8 @@ public class ProviderModelSliceHelper {
         final SubscriptionInfo defaultSubscription = mSubscriptionManager.getActiveSubscriptionInfo(
                 mSubscriptionManager.getDefaultDataSubscriptionId());
         if (defaultSubscription != null) {
-            title = defaultSubscription.getDisplayName().toString();
+            title = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                    defaultSubscription, mContext).toString();
         }
         return title;
     }

src/com/android/settings/network/SubscriptionsPreferenceController.java

@@ -241,7 +241,8 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
                     startMobileNetworkActivity(mContext, subInfo.getSubscriptionId()));
         }
 
-        mSubsGearPref.setTitle(subInfo.getDisplayName());
+        mSubsGearPref.setTitle(SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                subInfo, mContext));
         mSubsGearPref.setOrder(mStartOrder);
         mSubsGearPref.setSummary(getMobilePreferenceSummary(subInfo.getSubscriptionId()));
         mSubsGearPref.setIcon(getIcon(subInfo.getSubscriptionId()));
@@ -322,7 +323,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
                 pref = new Preference(mPreferenceGroup.getContext());
                 mPreferenceGroup.addPreference(pref);
             }
-            pref.setTitle(info.getDisplayName());
+            pref.setTitle(SubscriptionUtil.getUniqueSubscriptionDisplayName(info, mContext));
             final boolean isDefaultForData = (subId == dataDefaultSubId);
             pref.setSummary(getSummary(subId, isDefaultForData));
             setIcon(pref, subId, isDefaultForData);
@@ -584,4 +585,4 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
                     NO_CELL_DATA_TYPE_ICON, cutOut);
         }
     }
-}
+}

src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java

@@ -145,7 +145,7 @@ public class ContactDiscoveryPreferenceController extends TelephonyTogglePrefere
 
         for (SubscriptionInfo info : SubscriptionUtil.getAvailableSubscriptions(context)) {
             if (mSubId == info.getSubscriptionId()) {
-                result = info.getDisplayName();
+                result = SubscriptionUtil.getUniqueSubscriptionDisplayName(info, context);
                 break;
             }
         }

src/com/android/settings/network/telephony/DefaultSubscriptionController.java

@@ -126,7 +126,7 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
         final SubscriptionInfo info = getDefaultSubscriptionInfo();
         if (info != null) {
             // display subscription based account
-            return info.getDisplayName();
+            return SubscriptionUtil.getUniqueSubscriptionDisplayName(info, mContext);
         } else {
             if (isAskEverytimeSupported()) {
                 return mContext.getString(R.string.calls_and_sms_ask_every_time);
@@ -160,7 +160,8 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
 
         if (Utils.isProviderModelEnabled(mContext) && subs.size() == 1) {
             mPreference.setEnabled(false);
-            mPreference.setSummary(subs.get(0).getDisplayName());
+            mPreference.setSummary(SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                    subs.get(0), mContext));
             return;
         }
 
@@ -171,7 +172,7 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere
             if (sub.isOpportunistic()) {
                 continue;
             }
-            displayNames.add(sub.getDisplayName());
+            displayNames.add(SubscriptionUtil.getUniqueSubscriptionDisplayName(sub, mContext));
             final int subId = sub.getSubscriptionId();
             subscriptionIds.add(Integer.toString(subId));
             if (subId == serviceDefaultSubId) {

src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java

@@ -16,7 +16,6 @@
 
 package com.android.settings.network.telephony;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -141,7 +140,9 @@ public class DeleteEuiccSubscriptionDialogActivity extends SubscriptionActionDia
                 DIALOG_TAG_DELETE_SIM_CONFIRMATION,
                 getString(R.string.erase_sim_dialog_title),
                 getString(
-                        R.string.erase_sim_dialog_text, mSubscriptionToBeDeleted.getDisplayName()),
+                        R.string.erase_sim_dialog_text,
+                        SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                                mSubscriptionToBeDeleted, this)),
                 getString(R.string.erase_sim_confirm_button),
                 getString(R.string.cancel));
     }

src/com/android/settings/network/telephony/MobileDataDialogFragment.java

@@ -28,6 +28,7 @@ import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.wifi.WifiPickerTrackerHelper;
 
 
@@ -97,12 +98,14 @@ public class MobileDataDialogFragment extends InstrumentedDialogFragment impleme
                 final String previousName = (nextSubInfo == null)
                         ? getContext().getResources().getString(
                         R.string.sim_selection_required_pref)
-                        : nextSubInfo.getDisplayName().toString();
+                        : SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                                nextSubInfo, getContext()).toString();
 
                 final String newName = (currentSubInfo == null)
                         ? getContext().getResources().getString(
                         R.string.sim_selection_required_pref)
-                        : currentSubInfo.getDisplayName().toString();
+                        : SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                                currentSubInfo, getContext()).toString();
 
                 return new AlertDialog.Builder(context)
                         .setTitle(context.getString(R.string.sim_change_data_title, newName))

src/com/android/settings/network/telephony/MobileDataSlice.java

@@ -167,7 +167,7 @@ public class MobileDataSlice implements CustomSliceable {
             return null; // no summary text
         }
 
-        return defaultSubscription.getDisplayName();
+        return SubscriptionUtil.getUniqueSubscriptionDisplayName(defaultSubscription, mContext);
     }
 
     private PendingIntent getPrimaryAction() {

src/com/android/settings/network/telephony/MobileNetworkActivity.java

@@ -207,7 +207,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
         // title will just default to the label for this activity that's already specified in
         // AndroidManifest.xml.
         if (subscription != null) {
-            setTitle(subscription.getDisplayName());
+            setTitle(SubscriptionUtil.getUniqueSubscriptionDisplayName(subscription, this));
         }
     }
 
@@ -299,7 +299,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
         CharSequence carrierName = "";
         if (info != null) {
             subId = info.getSubscriptionId();
-            carrierName = info.getDisplayName();
+            carrierName = SubscriptionUtil.getUniqueSubscriptionDisplayName(info, this);
         }
         // If this activity was launched using ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN, show the
         // associated dialog only if the opt-in has not been granted yet.

src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java

@@ -32,13 +32,11 @@ import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.ArrayMap;
 import android.util.ArraySet;
-import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
 import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
@@ -194,7 +192,7 @@ public class NetworkProviderWifiCallingGroup extends
                 mPreferenceGroup.addPreference(pref);
             }
 
-            CharSequence title = info.getDisplayName();
+            CharSequence title = SubscriptionUtil.getUniqueSubscriptionDisplayName(info, mContext);
             if (getPhoneAccountHandleForSubscriptionId(subId) != null) {
                 final Intent intent = MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
                         getPhoneAccountHandleForSubscriptionId(subId));

src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java

@@ -47,6 +47,7 @@ import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settingslib.DeviceInfoUtils;
 
 import com.google.common.collect.ImmutableMap;
@@ -163,7 +164,8 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
             Log.w(TAG, "got null SubscriptionInfo for mSubId:" + mSubId);
             return;
         }
-        final CharSequence displayName = info.getDisplayName();
+        final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                info, getContext());
         mNameView.setText(displayName);
         if (!TextUtils.isEmpty(displayName)) {
             mNameView.setSelection(displayName.length());

src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java

@@ -201,7 +201,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
                     showProgressDialog(
                             getString(
                                     R.string.sim_action_switch_sub_dialog_progress,
-                                    mSubInfo.getDisplayName()));
+                                    SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                                            mSubInfo, this)));
                     mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
                     return;
                 }
@@ -345,13 +346,14 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
 
     /* Displays the SIM toggling confirmation dialog. */
     private void showDisableSimConfirmDialog() {
+        final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                mSubInfo, this);
         String title =
-                mSubInfo == null || TextUtils.isEmpty(mSubInfo.getDisplayName())
+                mSubInfo == null || TextUtils.isEmpty(displayName)
                         ? getString(
                                 R.string.privileged_action_disable_sub_dialog_title_without_carrier)
                         : getString(
-                                R.string.privileged_action_disable_sub_dialog_title,
+                                R.string.privileged_action_disable_sub_dialog_title, displayName);
-                                mSubInfo.getDisplayName());
 
         ConfirmDialogFragment.show(
                 this,
@@ -402,40 +404,48 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
     private String getSwitchDialogPosBtnText() {
         return mIsEsimOperation
                 ? getString(
-                        R.string.sim_action_switch_sub_dialog_confirm, mSubInfo.getDisplayName())
+                        R.string.sim_action_switch_sub_dialog_confirm,
+                        SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this))
                 : getString(R.string.sim_switch_button);
     }
 
     private String getEnableSubscriptionTitle() {
-        if (mSubInfo == null || TextUtils.isEmpty(mSubInfo.getDisplayName())) {
+        final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                mSubInfo, this);
+        if (mSubInfo == null || TextUtils.isEmpty(displayName)) {
             return getString(R.string.sim_action_enable_sub_dialog_title_without_carrier_name);
         }
-        return getString(R.string.sim_action_enable_sub_dialog_title, mSubInfo.getDisplayName());
+        return getString(R.string.sim_action_enable_sub_dialog_title, displayName);
     }
 
     private String getSwitchSubscriptionTitle() {
         if (mIsEsimOperation) {
             return getString(
-                    R.string.sim_action_switch_sub_dialog_title, mSubInfo.getDisplayName());
+                    R.string.sim_action_switch_sub_dialog_title,
+                    SubscriptionUtil.getUniqueSubscriptionDisplayName(mSubInfo, this));
         }
         return getString(R.string.sim_action_switch_psim_dialog_title);
     }
 
     private String getSwitchDialogBodyMsg(SubscriptionInfo activeSub, boolean betweenEsim) {
+        final CharSequence subInfoName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                mSubInfo, this);
+        final CharSequence activeSubName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                activeSub, this);
         if (betweenEsim && mIsEsimOperation) {
             return getString(
                     R.string.sim_action_switch_sub_dialog_text_downloaded,
-                    mSubInfo.getDisplayName(),
+                    subInfoName,
-                    activeSub.getDisplayName());
+                    activeSubName);
         } else if (mIsEsimOperation) {
             return getString(
                     R.string.sim_action_switch_sub_dialog_text,
-                    mSubInfo.getDisplayName(),
+                    subInfoName,
-                    activeSub.getDisplayName());
+                    activeSubName);
         } else {
             return getString(
                     R.string.sim_action_switch_sub_dialog_text_single_sim,
-                    activeSub.getDisplayName());
+                    activeSubName);
         }
     }
 

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);
 

src/com/android/settings/wifi/WifiConfigController.java

@@ -69,6 +69,7 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.utils.ThreadUtils;
@@ -1473,8 +1474,8 @@ public class WifiConfigController implements TextWatcher,
         }
 
         // Shows display name of each active subscription.
-        final String[] displayNames = mActiveSubscriptionInfos.stream().map(
+        final String[] displayNames = SubscriptionUtil.getUniqueSubscriptionDisplayNames(
-                SubscriptionInfo::getDisplayName).toArray(String[]::new);
+                mContext).values().stream().toArray(String[]::new);
         mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));
         mEapSimSpinner.setSelection(0 /* position */);
         if (displayNames.length == 1) {

src/com/android/settings/wifi/WifiConfigController2.java

@@ -67,6 +67,7 @@ import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
@@ -1437,8 +1438,8 @@ public class WifiConfigController2 implements TextWatcher,
         }
 
         // Shows display name of each active subscription.
-        final String[] displayNames = mActiveSubscriptionInfos.stream().map(
+        final String[] displayNames = SubscriptionUtil.getUniqueSubscriptionDisplayNames(
-                SubscriptionInfo::getDisplayName).toArray(String[]::new);
+                mContext).values().stream().toArray(String[]::new);
         mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));
         mEapSimSpinner.setSelection(0 /* position */);
         if (displayNames.length == 1) {

src/com/android/settings/wifi/calling/WifiCallingSettings.java

@@ -163,7 +163,8 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
 
         @Override
         public CharSequence getPageTitle(int position) {
-            return String.valueOf(mSil.get(position).getDisplayName());
+            return String.valueOf(SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                    mSil.get(position), getContext()));
         }
 
         @Override

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

@@ -69,6 +69,7 @@ import com.android.settings.Utils;
 import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.datausage.WifiDataUsageSummaryPreferenceController;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.wifi.WifiDialog2;
 import com.android.settings.wifi.WifiDialog2.WifiDialog2Listener;
@@ -696,8 +697,10 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
         final int defaultDataSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
         if (activeSubscriptionInfos != null) {
             for (SubscriptionInfo subscriptionInfo : activeSubscriptionInfos) {
+                final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName(
+                        subscriptionInfo, mContext);
                 if (config.carrierId == subscriptionInfo.getCarrierId()) {
-                    mEapSimSubscriptionPref.setSummary(subscriptionInfo.getDisplayName());
+                    mEapSimSubscriptionPref.setSummary(displayName);
                     return;
                 }
 
@@ -705,7 +708,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
                 // defaultDataSubscriptionId.
                 if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID
                         && defaultDataSubscriptionId == subscriptionInfo.getSubscriptionId()) {
-                    mEapSimSubscriptionPref.setSummary(subscriptionInfo.getDisplayName());
+                    mEapSimSubscriptionPref.setSummary(displayName);
                     return;
                 }
             }

tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java

@@ -155,6 +155,7 @@ public class MobileNetworkSummaryControllerTest {
         when(sub1.getSubscriptionId()).thenReturn(1);
         when(sub1.getDisplayName()).thenReturn("sub1");
         SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
         mController.displayPreference(mPreferenceScreen);
         mController.onResume();
         assertThat(mController.getSummary()).isEqualTo("sub1");
@@ -194,6 +195,7 @@ public class MobileNetworkSummaryControllerTest {
         when(sub1.getSubscriptionId()).thenReturn(1);
         when(sub1.getDisplayName()).thenReturn("sub1");
         SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
         when(mSubscriptionManager.isActiveSubscriptionId(eq(1))).thenReturn(false);
         when(mSubscriptionManager.canDisablePhysicalSubscription()).thenReturn(true);
 
@@ -238,6 +240,7 @@ public class MobileNetworkSummaryControllerTest {
         when(sub2.getDisplayName()).thenReturn("sub2");
 
         SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
         mController.displayPreference(mPreferenceScreen);
         mController.onResume();
         assertThat(mController.getSummary()).isEqualTo("2 SIMs");
@@ -267,6 +270,7 @@ public class MobileNetworkSummaryControllerTest {
         when(sub2.getDisplayName()).thenReturn("sub2");
 
         SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
         mController.displayPreference(mPreferenceScreen);
         mController.onResume();
         assertThat(mController.getSummary()).isEqualTo("sub1");
@@ -295,6 +299,7 @@ public class MobileNetworkSummaryControllerTest {
         when(sub2.getDisplayName()).thenReturn("sub2");
 
         SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
         FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);
         mController.displayPreference(mPreferenceScreen);
         mController.onResume();

tests/robotests/src/com/android/settings/sim/PreferredSimDialogFragmentTest.java

@@ -33,6 +33,7 @@ import android.content.DialogInterface;
 
 import androidx.appcompat.app.AlertDialog;
 
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Test;
@@ -40,6 +41,8 @@ import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.Arrays;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowAlertDialogCompat.class)
 public class PreferredSimDialogFragmentTest extends
@@ -72,6 +75,7 @@ public class PreferredSimDialogFragmentTest extends
 
     @Test
     public void onCreateDialog_twoSimsSelectFirst_correctMessage() {
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(mSim1, mSim2));
         mIntent.putExtra(PREFERRED_SIM, 0);
 
         final AlertDialog alertDialog = startDialog();
@@ -83,6 +87,7 @@ public class PreferredSimDialogFragmentTest extends
 
     @Test
     public void onCreateDialog_twoSimsSelectSecond_correctMessage() {
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(mSim1, mSim2));
         mIntent.putExtra(PREFERRED_SIM, 1);
 
         final AlertDialog alertDialog = startDialog();

tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java

@@ -62,6 +62,7 @@ import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
 
 import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Before;
@@ -73,6 +74,8 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.Arrays;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowAlertDialogCompat.class)
 public class SimSelectNotificationTest {
@@ -117,6 +120,7 @@ public class SimSelectNotificationTest {
                 .thenReturn(mNotificationManager);
         when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
                 .thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
         when(mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE))
                 .thenReturn(mSubscriptionManager);
         when(mContext.getApplicationInfo()).thenReturn(new ApplicationInfo());
@@ -126,8 +130,10 @@ public class SimSelectNotificationTest {
 
         when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
         when(mTelephonyManager.isDataEnabledForApn(TYPE_MMS)).thenReturn(false);
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(mSubInfo));
         when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
         when(mSubscriptionManager.getActiveSubscriptionInfo(mSubId)).thenReturn(mSubInfo);
+        when(mSubInfo.getSubscriptionId()).thenReturn(mSubId);
         when(mSubInfo.getDisplayName()).thenReturn(mFakeDisplayName);
         when(mContext.getResources()).thenReturn(mResources);
 

tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java

@@ -830,6 +830,8 @@ public class WifiConfigController2Test {
         when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
         final SubscriptionInfo subscriptionInfo = mock(SubscriptionInfo.class);
         final int carrierId = 6;
+        when(subscriptionInfo.getSubscriptionId()).thenReturn(carrierId);
+        when(subscriptionInfo.getDisplayName()).thenReturn("FAKE-CARRIER");
         when(subscriptionInfo.getCarrierId()).thenReturn(carrierId);
         when(subscriptionInfo.getCarrierName()).thenReturn("FAKE-CARRIER");
         mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(subscriptionInfo));

tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java

@@ -625,6 +625,8 @@ public class WifiConfigControllerTest {
         when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
         final SubscriptionInfo subscriptionInfo = mock(SubscriptionInfo.class);
         final int carrierId = 6;
+        when(subscriptionInfo.getSubscriptionId()).thenReturn(carrierId);
+        when(subscriptionInfo.getDisplayName()).thenReturn("FAKE-CARRIER");
         when(subscriptionInfo.getCarrierId()).thenReturn(carrierId);
         when(subscriptionInfo.getCarrierName()).thenReturn("FAKE-CARRIER");
         mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(subscriptionInfo));

tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsTest.java

@@ -54,6 +54,8 @@ import java.util.Collections;
 public class WifiCallingSettingsTest {
     private static final int SUB_ID1 = 111;
     private static final int SUB_ID2 = 222;
+    private static final CharSequence DISPLAY_NAME1 = "Carrier1";
+    private static final CharSequence DISPLAY_NAME2 = "Carrier2";
 
     private Context mContext;
 
@@ -87,6 +89,7 @@ public class WifiCallingSettingsTest {
 
     @Test
     public void setupFragment_noSubscriptions_noCrash() {
+        SubscriptionUtil.setActiveSubscriptionsForTesting(null);
         FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId*/,
                 null /* bundle */);
     }
@@ -119,6 +122,8 @@ public class WifiCallingSettingsTest {
         final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
         when(info1.getSubscriptionId()).thenReturn(SUB_ID1);
         when(info2.getSubscriptionId()).thenReturn(SUB_ID2);
+        when(info1.getDisplayName()).thenReturn(DISPLAY_NAME1);
+        when(info2.getDisplayName()).thenReturn(DISPLAY_NAME2);
 
         SubscriptionUtil.setActiveSubscriptionsForTesting(new ArrayList<>(
                 Arrays.asList(info1, info2)));

tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java

@@ -61,10 +61,13 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
 public class ProviderModelSliceHelperTest {
+    private static final int DEFAULT_SUBID = 1;
+
     private Context mContext;
     private MockProviderModelSliceHelper mProviderModelSliceHelper;
     private PersistableBundle mBundle;
@@ -168,10 +171,15 @@ public class ProviderModelSliceHelperTest {
         String expectDisplayName = "Name1";
         String expectedSubtitle = "5G";
         String networkType = "5G";
-        int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+
+        final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId);
+        when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
         when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
                 mDefaultDataSubscriptionInfo);
-        when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mDefaultDataSubscriptionInfo));
+
         when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
         mBundle.putBoolean(CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false);
         addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI);
@@ -194,10 +202,13 @@ public class ProviderModelSliceHelperTest {
         String expectedSubtitle = ResourcesUtils.getResourcesString(mContext,
                 "preference_summary_default_combination", connectedText, networkType);
 
-        int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId);
+        when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
         when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
                 mDefaultDataSubscriptionInfo);
-        when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mDefaultDataSubscriptionInfo));
         when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
         mBundle.putBoolean(CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false);
         addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);