From d368e85c2e1dbd567a544d957d6e879926096a67 Mon Sep 17 00:00:00 2001
From: Peter Wang <tpwang@google.com>
Date: Fri, 11 Jun 2021 14:47:15 -0700
Subject: [PATCH] Use translated name ("SIM") for default profile display name
 ("CARD")

Bug: 186156909
Test: Local
Change-Id: Icb8e5e7afb64d28e1ff7567882288fb1621dbe9a
---
 src/com/android/settings/network/SubscriptionUtil.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index e7dd5e914cc..48ff591a43e 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -54,6 +54,7 @@ import java.util.stream.Stream;
 
 public class SubscriptionUtil {
     private static final String TAG = "SubscriptionUtil";
+    private static final String PROFILE_GENERIC_DISPLAY_NAME = "CARD";
     private static List<SubscriptionInfo> sAvailableResultsForTesting;
     private static List<SubscriptionInfo> sActiveResultsForTesting;
 
@@ -257,7 +258,10 @@ public class SubscriptionUtil {
                 .map(i -> {
                     DisplayInfo info = new DisplayInfo();
                     info.subscriptionInfo = i;
-                    info.originalName = i.getDisplayName().toString().trim();
+                    String displayName = i.getDisplayName().toString();
+                    info.originalName = TextUtils.equals(displayName, PROFILE_GENERIC_DISPLAY_NAME)
+                            ? context.getResources().getString(R.string.sim_card)
+                            : displayName.trim();
                     return info;
                 });