commit d269444d27ad39f8a2cab85f292400107f59915f
author Grace Jia <xiaotonj@google.com> Mon Jan 13 14:47:28 2020 -0800
committer Grace Jia <xiaotonj@google.com> Tue Jan 14 00:56:27 2020 +0000
tree 767c8f86c5d261984131331e31ccab75c78d8bdc
parent d9d2c88b671c66940d8d7f0735da2919089a47ec

Use TelephonyManager instance specified with subscription id to get
network operator name.

Bug: 130775430
Test: Manual
Change-Id: I132dc761a10d00f30512b3784938bed71e3f3523

src/com/android/services/telephony/TelecomAccountRegistry.java

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 5a1e6a6..609539e 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -226,6 +226,7 @@
             // slotId from the subId or the phoneId in all instances.
             SubscriptionInfo record =
                     mSubscriptionManager.getActiveSubscriptionInfo(subId);
+            TelephonyManager tm = mTelephonyManager.createForSubscriptionId(subId);
 
             if (isEmergency) {
                 label = mContext.getResources().getString(R.string.sim_label_emergency_calls);
@@ -234,7 +235,7 @@
             } else if (mTelephonyManager.getPhoneCount() == 1) {
                 // For single-SIM devices, we show the label and description as whatever the name of
                 // the network is.
-                description = label = mTelephonyManager.getNetworkOperatorName();
+                description = label = tm.getNetworkOperatorName();
             } else {
                 CharSequence subDisplayName = null;