Merge "Use SubscriptionController api to set display name" (5438ba1b) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −16

Original line number	Diff line number	Diff line
		@@ -427,20 +427,12 @@ public class SubscriptionInfoUpdater extends Handler {
		ContentResolver contentResolver = mContext.getContentResolver();

		if (msisdn != null) {
		ContentValues number = new ContentValues(1);
		number.put(SubscriptionManager.NUMBER, msisdn);
		contentResolver.update(SubscriptionManager.CONTENT_URI, number,
		SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID + "="
		+ Long.toString(subId), null);

		// refresh Cached Active Subscription Info List
		SubscriptionController.getInstance().refreshCachedActiveSubscriptionInfoList();
		SubscriptionController.getInstance().setDisplayNumber(msisdn, subId);
		}

		SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(subId);
		String nameToSet;
		String simCarrierName = tm.getSimOperatorName(subId);
		ContentValues name = new ContentValues(1);

		if (subInfo != null && subInfo.getNameSource() !=
		SubscriptionManager.NAME_SOURCE_USER_INPUT) {
		@@ -449,14 +441,8 @@ public class SubscriptionInfoUpdater extends Handler {
		} else {
		nameToSet = "CARD " + Integer.toString(slotId + 1);
		}
		name.put(SubscriptionManager.DISPLAY_NAME, nameToSet);
		logd("sim name = " + nameToSet);
		contentResolver.update(SubscriptionManager.CONTENT_URI, name,
		SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID
		+ "=" + Long.toString(subId), null);

		// refresh Cached Active Subscription Info List
		SubscriptionController.getInstance().refreshCachedActiveSubscriptionInfoList();
		SubscriptionController.getInstance().setDisplayName(nameToSet, subId);
		}

		/* Update preferred network type and network selection mode on SIM change.