Clean up public API of SubInfoRecord. (5f208fd8) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ public class IccProvider extends ContentProvider {
		int subId;

		for (int i = 0; i < subIdCount; i++) {
		subId = subInfoList.get(i).subId;
		subId = subInfoList.get(i).getSubscriptionId();
		result[i] = loadFromEf(efType, subId);
		Rlog.i(TAG,"ADN Records loaded for Subscription ::" + subId);
		}

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

+15 −13

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ public class SubInfoRecordUpdater extends Handler {
		SubscriptionManager.getSubInfoForSubscriber(subId);

		if (subInfo != null
		&& subInfo.nameSource != SubscriptionManager.NAME_SOURCE_USER_INPUT) {
		&& subInfo.getNameSource() != SubscriptionManager.NAME_SOURCE_USER_INPUT) {
		SpnOverride mSpnOverride = new SpnOverride();
		String nameToSet;
		String CarrierName =
		@@ -202,17 +202,17 @@ public class SubInfoRecordUpdater extends Handler {
		SubInfoRecord subInfo = SubscriptionManager.getSubInfoForSubscriber(subId);
		if (subInfo != null) {
		// overwrite SIM display name if it is not assigned by user
		int oldNameSource = subInfo.nameSource;
		String oldSubName = subInfo.displayName;
		logd("[setDisplayNameForNewSub] mSubInfoIdx = " + subInfo.subId + ", oldSimName = "
		+ oldSubName + ", oldNameSource = " + oldNameSource + ", newSubName = "
		+ newSubName + ", newNameSource = " + newNameSource);
		int oldNameSource = subInfo.getNameSource();
		CharSequence oldSubName = subInfo.getDisplayName();
		logd("[setDisplayNameForNewSub] subId = " + subInfo.getSubscriptionId()
		+ ", oldSimName = " + oldSubName + ", oldNameSource = " + oldNameSource
		+ ", newSubName = " + newSubName + ", newNameSource = " + newNameSource);
		if (oldSubName == null \|\|
		(oldNameSource == SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE && newSubName != null) \|\|
		(oldNameSource == SubscriptionManager.NAME_SOURCE_SIM_SOURCE && newSubName != null
		&& !newSubName.equals(oldSubName))) {
		SubscriptionManager.setDisplayName(newSubName,
		subInfo.subId, newNameSource);
		SubscriptionManager.setDisplayName(newSubName, subInfo.getSubscriptionId(),
		newNameSource);
		}
		} else {
		logd("SUB" + (subId + 1) + " SubInfo not created yet");
		@@ -319,8 +319,8 @@ public class SubInfoRecordUpdater extends Handler {
		List<SubInfoRecord> oldSubInfo =
		SubscriptionController.getInstance().getSubInfoUsingSlotIdWithCheck(i, false);
		if (oldSubInfo != null) {
		oldIccId[i] = oldSubInfo.get(0).iccId;
		logd("oldSubId = " + oldSubInfo.get(0).subId);
		oldIccId[i] = oldSubInfo.get(0).getIccId();
		logd("oldSubId = " + oldSubInfo.get(0).getSubscriptionId());
		if (sInsertSimState[i] == SIM_NOT_CHANGE && !sIccId[i].equals(oldIccId[i])) {
		sInsertSimState[i] = SIM_CHANGED;
		}
		@@ -329,7 +329,7 @@ public class SubInfoRecordUpdater extends Handler {
		value.put(SubscriptionManager.SIM_ID, SubscriptionManager.INVALID_SLOT_ID);
		contentResolver.update(SubscriptionManager.CONTENT_URI, value,
		SubscriptionManager._ID + "="
		+ Long.toString(oldSubInfo.get(0).subId), null);
		+ Integer.toString(oldSubInfo.get(0).getSubscriptionId()), null);
		}
		} else {
		if (sInsertSimState[i] == SIM_NOT_CHANGE) {
		@@ -396,13 +396,15 @@ public class SubInfoRecordUpdater extends Handler {
		for (int i=0; i<nSubCount; i++) {
		SubInfoRecord temp = subInfos.get(i);

		String msisdn = TelephonyManager.getDefault().getLine1NumberForSubscriber(temp.subId);
		String msisdn = TelephonyManager.getDefault().getLine1NumberForSubscriber(
		temp.getSubscriptionId());

		if (msisdn != null) {
		ContentValues value = new ContentValues(1);
		value.put(SubscriptionManager.NUMBER, msisdn);
		contentResolver.update(SubscriptionManager.CONTENT_URI, value,
		SubscriptionManager._ID + "=" + Long.toString(temp.subId), null);
		SubscriptionManager._ID + "="
		+ Integer.toString(temp.getSubscriptionId()), null);
		}
		}

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

+22 −22

Original line number	Diff line number	Diff line
		@@ -251,40 +251,39 @@ public class SubscriptionController extends ISub.Stub {
		* @return the query result of desired SubInfoRecord
		*/
		private SubInfoRecord getSubInfoRecord(Cursor cursor) {
		SubInfoRecord info = new SubInfoRecord();
		info.subId = cursor.getInt(cursor.getColumnIndexOrThrow(BaseColumns._ID));
		info.iccId = cursor.getString(cursor.getColumnIndexOrThrow(
		int id = cursor.getInt(cursor.getColumnIndexOrThrow(BaseColumns._ID));
		String iccId = cursor.getString(cursor.getColumnIndexOrThrow(
		SubscriptionManager.ICC_ID));
		info.slotId = cursor.getInt(cursor.getColumnIndexOrThrow(
		int simSlotIndex = cursor.getInt(cursor.getColumnIndexOrThrow(
		SubscriptionManager.SIM_ID));
		info.displayName = cursor.getString(cursor.getColumnIndexOrThrow(
		String displayName = cursor.getString(cursor.getColumnIndexOrThrow(
		SubscriptionManager.DISPLAY_NAME));
		info.nameSource = cursor.getInt(cursor.getColumnIndexOrThrow(
		int nameSource = cursor.getInt(cursor.getColumnIndexOrThrow(
		SubscriptionManager.NAME_SOURCE));
		info.color = cursor.getInt(cursor.getColumnIndexOrThrow(
		int color = cursor.getInt(cursor.getColumnIndexOrThrow(
		SubscriptionManager.COLOR));
		info.number = cursor.getString(cursor.getColumnIndexOrThrow(
		String number = cursor.getString(cursor.getColumnIndexOrThrow(
		SubscriptionManager.NUMBER));
		info.displayNumberFormat = cursor.getInt(cursor.getColumnIndexOrThrow(
		SubscriptionManager.DISPLAY_NUMBER_FORMAT));
		info.dataRoaming = cursor.getInt(cursor.getColumnIndexOrThrow(
		int dataRoaming = cursor.getInt(cursor.getColumnIndexOrThrow(
		SubscriptionManager.DATA_ROAMING));

		int[] simIconRes = new int[2];
		int size = sSimBackgroundDarkRes.length;
		if (info.color >= 0 && info.color < size) {
		info.simIconRes[RES_TYPE_BACKGROUND_DARK] = sSimBackgroundDarkRes[info.color];
		info.simIconRes[RES_TYPE_BACKGROUND_LIGHT] = sSimBackgroundLightRes[info.color];
		if (color >= 0 && color < size) {
		simIconRes[RES_TYPE_BACKGROUND_DARK] = sSimBackgroundDarkRes[color];
		simIconRes[RES_TYPE_BACKGROUND_LIGHT] = sSimBackgroundLightRes[color];
		}
		info.mcc = cursor.getInt(cursor.getColumnIndexOrThrow(
		int mcc = cursor.getInt(cursor.getColumnIndexOrThrow(
		SubscriptionManager.MCC));
		info.mnc = cursor.getInt(cursor.getColumnIndexOrThrow(
		int mnc = cursor.getInt(cursor.getColumnIndexOrThrow(
		SubscriptionManager.MNC));

		logd("[getSubInfoRecord] SubId:" + info.subId + " iccid:" + info.iccId + " slotId:" +
		info.slotId + " displayName:" + info.displayName + " color:" + info.color +
		" mcc/mnc:" + info.mcc + "/" + info.mnc);
		logd("[getSubInfoRecord] id:" + id + " iccid:" + iccId + " simSlotIndex:" + simSlotIndex
		+ " displayName:" + displayName + " color:" + color + " mcc:" + mcc
		+ " mnc:" + mnc);

		return info;
		return new SubInfoRecord(id, iccId, simSlotIndex, displayName, nameSource, color,
		number, dataRoaming, simIconRes, mcc, mnc);
		}

		/**
		@@ -1245,8 +1244,9 @@ public class SubscriptionController extends ISub.Stub {
		return false;
		}
		for (SubInfoRecord record : records) {
		logdl("[shouldDefaultBeCleared] Record.subId: " + record.subId);
		if (record.subId == subId) {
		int id = record.getSubscriptionId();
		logdl("[shouldDefaultBeCleared] Record.id: " + id);
		if (id == subId) {
		logdl("[shouldDefaultBeCleared] return false subId is active, subId=" + subId);
		return false;
		}