Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev (7a71b5bd) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ public abstract class ServiceStateTracker extends Handler {
		if (DBG) log("SubscriptionListener.onSubscriptionInfoChanged");
		// Set the network type, in case the radio does not restore it.
		int subId = mPhoneBase.getSubId();
		if (SubscriptionManager.isValidSubId(subId)) {
		if (SubscriptionManager.isValidSubscriptionId(subId)) {
		int networkType = PhoneFactory.calculatePreferredNetworkType(
		mPhoneBase.getContext(), subId);
		mCi.setPreferredNetworkType(networkType, null);

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -724,7 +724,8 @@ public class SubscriptionController extends ISub.Stub {
		// If mSlotIdToSubIdMap already has a valid subId for a slotId/phoneId,
		// do not add another subId for same slotId/phoneId.
		Integer currentSubId = mSlotIdxToSubId.get(slotId);
		if (currentSubId == null \|\| !SubscriptionManager.isValidSubId(currentSubId)) {
		if (currentSubId == null
		\|\| !SubscriptionManager.isValidSubscriptionId(currentSubId)) {
		// TODO While two subs active, if user deactivats first
		// one, need to update the default subId with second one.

		@@ -742,7 +743,8 @@ public class SubscriptionController extends ISub.Stub {
		}

		// Set the default sub if not set or if single sim device
		if (!SubscriptionManager.isValidSubId(defaultSubId) \|\| subIdCountMax == 1) {
		if (!SubscriptionManager.isValidSubscriptionId(defaultSubId)
		\|\| subIdCountMax == 1) {
		setDefaultSubId(subId);
		}
		// If single sim device, set this subscription as the default for everything
		@@ -981,7 +983,7 @@ public class SubscriptionController extends ISub.Stub {
		if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
		subId = getDefaultSubId();
		}
		if (!SubscriptionManager.isValidSubId(subId)) {
		if (!SubscriptionManager.isValidSubscriptionId(subId)) {
		if (DBG) logd("[getSlotId]- subId invalid");
		return SubscriptionManager.INVALID_SIM_SLOT_INDEX;
		}
		@@ -1079,7 +1081,7 @@ public class SubscriptionController extends ISub.Stub {
		if (DBG) logdl("[getPhoneId] asked for default subId=" + subId);
		}

		if (!SubscriptionManager.isValidSubId(subId)) {
		if (!SubscriptionManager.isValidSubscriptionId(subId)) {
		if (DBG) {
		logdl("[getPhoneId]- invalid subId return="
		+ SubscriptionManager.INVALID_PHONE_INDEX);
		@@ -1331,7 +1333,7 @@ public class SubscriptionController extends ISub.Stub {
		throw new RuntimeException("setDefaultSubId called with DEFAULT_SUB_ID");
		}
		if (DBG) logdl("[setDefaultSubId] subId=" + subId);
		if (SubscriptionManager.isValidSubId(subId)) {
		if (SubscriptionManager.isValidSubscriptionId(subId)) {
		int phoneId = getPhoneId(subId);
		if (phoneId >= 0 && (phoneId < TelephonyManager.getDefault().getPhoneCount()
		\|\| TelephonyManager.getDefault().getSimCount() == 1)) {
		@@ -1383,9 +1385,8 @@ public class SubscriptionController extends ISub.Stub {
		if (DBG) logdl("[shouldDefaultBeCleared] return true no records subId=" + subId);
		return true;
		}
		if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
		// If the subId parameter is INVALID_SUBSCRIPTION_ID its
		// already cleared so return false.
		if (!SubscriptionManager.isValidSubscriptionId(subId)) {
		// If the subId parameter is not valid its already cleared so return false.
		if (DBG) logdl("[shouldDefaultBeCleared] return false only one subId, subId=" + subId);
		return false;
		}
		@@ -1462,7 +1463,7 @@ public class SubscriptionController extends ISub.Stub {

		private void validateSubId(int subId) {
		if (DBG) logd("validateSubId subId: " + subId);
		if (!SubscriptionManager.isValidSubId(subId)) {
		if (!SubscriptionManager.isValidSubscriptionId(subId)) {
		throw new RuntimeException("Invalid sub id passed as parameter");
		} else if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
		throw new RuntimeException("Default sub id passed as parameter");

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ public class SubscriptionInfoUpdater extends Handler {
		int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);

		if (SubscriptionManager.isValidSubId(subId)) {
		if (SubscriptionManager.isValidSubscriptionId(subId)) {
		String msisdn = TelephonyManager.getDefault()
		.getLine1NumberForSubscriber(subId);
		ContentResolver contentResolver = mContext.getContentResolver();

src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -487,7 +487,7 @@ public abstract class DcTrackerBase extends Handler {

		// Stop reconnect if not current subId is not correct.
		// FIXME STOPSHIP - phoneSubId is coming up as -1 way after boot and failing this?
		if (!SubscriptionManager.isValidSubId(currSubId) \|\| (currSubId != phoneSubId)) {
		if (!SubscriptionManager.isValidSubscriptionId(currSubId) \|\| (currSubId != phoneSubId)) {
		log("receive ReconnectAlarm but subId incorrect, ignore");
		return;
		}