Merge "Settings now shows the proper carrier name." into lmp-mr1-dev (417798be) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+15 −16

Original line number	Diff line number	Diff line
		@@ -149,33 +149,32 @@ public class SubscriptionInfoUpdater extends Handler {

		SubscriptionInfo subInfo =
		mSubscriptionManager.getActiveSubscriptionInfo(subId);

		if (subInfo != null
		&& subInfo.getNameSource() !=
		SubscriptionManager.NAME_SOURCE_USER_INPUT) {
		String nameToSet;
		String CarrierName =
		TelephonyManager.getDefault().getSimOperator(subId);
		logd("CarrierName = " + CarrierName);
		String simCarrierName =
		TelephonyManager.getDefault().getSimOperatorName(subId);
		ContentValues name = new ContentValues(1);

		if (subInfo != null
		&& subInfo.getNameSource() !=
		SubscriptionManager.NAME_SOURCE_USER_INPUT) {
		if (!TextUtils.isEmpty(simCarrierName)) {
		nameToSet = simCarrierName;
		} else {
		nameToSet = "CARD " + Integer.toString(slotId + 1);
		}
		logd("sim name = " + nameToSet + " carrier name = " + simCarrierName);

		ContentValues name = new ContentValues(1);
		name.put(SubscriptionManager.DISPLAY_NAME, nameToSet);
		logd("sim name = " + nameToSet);
		}
		name.put(SubscriptionManager.CARRIER_NAME,
		!TextUtils.isEmpty(simCarrierName) ? simCarrierName :
		mContext.getString(com.android.internal.R.string.unknownName));
		contentResolver.update(SubscriptionManager.CONTENT_URI, name,
		SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID
		+ "=" + Long.toString(subId), null);
		}
		logd("carrier name = " + simCarrierName);

		/* Update preferred network type and network selection mode on IMSI change.
		* Storing last IMSI in SharedPreference for now. Can consider making it