commit ca05b2f52e74c83c8b74160ceb274e003cd2ecd1
author Pranav Madapurmath <pmadapurmath@google.com> Tue Nov 15 22:47:42 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 15 22:47:42 2022 +0000
tree 441c8d6c4f0580382de9925c3eddf888928a7642
parent bd8e1e7c6650d9c21c48442e37e84ba99729d39d
parent dfcec64a74a45723d057e0e50c11f3b3bfd87e1b

Merge "TelecomAccountRegistry should be consistent in operator name retrieval"

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 115c32b..3d2fb85 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -304,8 +304,8 @@
                 subNumber = "";
             }
 
-            String label;
-            String description;
+            String label = "";
+            String description = "";
             Icon icon = null;
 
             // We can only get the real slotId from the SubInfoRecord, we can't calculate the
@@ -321,7 +321,9 @@
             } 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 = tm.getNetworkOperatorName();
+                if (record != null) {
+                    description = label = String.valueOf(record.getDisplayName());
+                }
             } else {
                 CharSequence subDisplayName = null;