Merge "Fix URL validation"
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;