Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev
diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
index 106aa02..03f3be4 100644
--- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
@@ -119,20 +119,21 @@
String summary;
if (isDisabledByCarrier) {
summary = mContext.getString(R.string.enable_2g_summary_disabled_carrier,
- getCarrierName());
+ getSimCardName());
} else {
summary = mContext.getString(R.string.enable_2g_summary);
}
preference.setSummary(summary);
}
- private String getCarrierName() {
+ private String getSimCardName() {
SubscriptionInfo subInfo = SubscriptionUtil.getSubById(mSubscriptionManager, mSubId);
if (subInfo == null) {
return "";
}
- CharSequence carrierName = subInfo.getCarrierName();
- return TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
+ // It is the sim card name, and it should be the same name as the sim page.
+ CharSequence simCardName = subInfo.getDisplayName();
+ return TextUtils.isEmpty(simCardName) ? "" : simCardName.toString();
}
/**