Snap for 5726890 from d9b7ad1b3d4ded6100d3873e3cfe3e0f0728825d to qt-c2f2-release (8db4e98c) · Commits · e / os / android_frameworks_opt_telephony

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

+107 −13

Original line number	Original line	Diff line number	Diff line
	@@ -31,13 +31,16 @@ import static android.telephony.TelephonyManager.EXTRA_SUBSCRIPTION_ID;
	import android.annotation.IntDef;		import android.annotation.IntDef;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.app.PendingIntent;		import android.app.PendingIntent;
			import android.content.BroadcastReceiver;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
			import android.content.IntentFilter;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Message;		import android.os.Message;
	import android.os.ParcelUuid;		import android.os.ParcelUuid;
	import android.provider.Settings;		import android.provider.Settings;
	import android.provider.Settings.SettingNotFoundException;		import android.provider.Settings.SettingNotFoundException;
			import android.telephony.CarrierConfigManager;
	import android.telephony.SubscriptionInfo;		import android.telephony.SubscriptionInfo;
	import android.telephony.SubscriptionManager;		import android.telephony.SubscriptionManager;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	@@ -51,6 +54,7 @@ import com.android.internal.util.ArrayUtils;
	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;		import java.lang.annotation.RetentionPolicy;
	import java.util.ArrayList;		import java.util.ArrayList;
			import java.util.Arrays;
	import java.util.List;		import java.util.List;
	import java.util.stream.Collectors;		import java.util.stream.Collectors;

	@@ -73,6 +77,7 @@ public class MultiSimSettingController extends Handler {
	private static final int EVENT_SUBSCRIPTION_INFO_CHANGED = 4;		private static final int EVENT_SUBSCRIPTION_INFO_CHANGED = 4;
	private static final int EVENT_SUBSCRIPTION_GROUP_CHANGED = 5;		private static final int EVENT_SUBSCRIPTION_GROUP_CHANGED = 5;
	private static final int EVENT_DEFAULT_DATA_SUBSCRIPTION_CHANGED = 6;		private static final int EVENT_DEFAULT_DATA_SUBSCRIPTION_CHANGED = 6;
			private static final int EVENT_CARRIER_CONFIG_CHANGED = 7;

	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@IntDef(prefix = {"PRIMARY_SUB_"},		@IntDef(prefix = {"PRIMARY_SUB_"},
	@@ -118,6 +123,32 @@ public class MultiSimSettingController extends Handler {
	// the SIMs are newly inserted instead of being initialized.		// the SIMs are newly inserted instead of being initialized.
	private boolean mSubInfoInitialized = false;		private boolean mSubInfoInitialized = false;

			// mInitialHandling is to make sure we don't always ask user to re-select data SIM after reboot.
			// After boot-up when things are firstly initialized (mSubInfoInitialized is changed to true
			// and carrier configs are all loaded), we do a reEvaluateAll(). In the first reEvaluateAll(),
			// mInitialHandling will be true and we won't pop up SIM select dialog.
			private boolean mInitialHandling = true;

			// Keep a record of which subIds have carrier config loaded. Length of the array is phone count.
			// The index is phoneId, and value is subId. For example:
			// If carrier config of subId 2 is loaded on phone 0,mCarrierConfigLoadedSubIds[0] = 2.
			// Then if subId 2 is deactivated from phone 0, the value becomes INVALID,
			// mCarrierConfigLoadedSubIds[0] = INVALID_SUBSCRIPTION_ID.
			private int[] mCarrierConfigLoadedSubIds;

			private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
			@Override
			public void onReceive(Context context, Intent intent) {
			if (CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED.equals(intent.getAction())) {
			int phoneId = intent.getIntExtra(CarrierConfigManager.EXTRA_SLOT_INDEX,
			SubscriptionManager.INVALID_SIM_SLOT_INDEX);
			int subId = intent.getIntExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX,
			SubscriptionManager.INVALID_SUBSCRIPTION_ID);
			notifyCarrierConfigChanged(phoneId, subId);
			}
			}
			};

	/**		/**
	* Return the singleton or create one if not existed.		* Return the singleton or create one if not existed.
	*/		*/
	@@ -149,6 +180,15 @@ public class MultiSimSettingController extends Handler {
	public MultiSimSettingController(Context context, SubscriptionController sc) {		public MultiSimSettingController(Context context, SubscriptionController sc) {
	mContext = context;		mContext = context;
	mSubController = sc;		mSubController = sc;

			// Initialize mCarrierConfigLoadedSubIds and register to listen to carrier config change.
			final int phoneCount = ((TelephonyManager) mContext.getSystemService(
			Context.TELEPHONY_SERVICE)).getPhoneCount();
			mCarrierConfigLoadedSubIds = new int[phoneCount];
			Arrays.fill(mCarrierConfigLoadedSubIds, SubscriptionManager.INVALID_SUBSCRIPTION_ID);

			context.registerReceiver(mIntentReceiver, new IntentFilter(
			CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
	}		}

	/**		/**
	@@ -222,6 +262,11 @@ public class MultiSimSettingController extends Handler {
	case EVENT_DEFAULT_DATA_SUBSCRIPTION_CHANGED:		case EVENT_DEFAULT_DATA_SUBSCRIPTION_CHANGED:
	onDefaultDataSettingChanged();		onDefaultDataSettingChanged();
	break;		break;
			case EVENT_CARRIER_CONFIG_CHANGED:
			int phoneId = msg.arg1;
			int subId = msg.arg2;
			onCarrierConfigChanged(phoneId, subId);
			break;
	}		}
	}		}

	@@ -261,9 +306,7 @@ public class MultiSimSettingController extends Handler {
	private void onAllSubscriptionsLoaded() {		private void onAllSubscriptionsLoaded() {
	if (DBG) log("onAllSubscriptionsLoaded");		if (DBG) log("onAllSubscriptionsLoaded");
	mSubInfoInitialized = true;		mSubInfoInitialized = true;
	updateDefaults(/init/ true);		reEvaluateAll();
	disableDataForNonDefaultNonOpportunisticSubscriptions();
	deactivateGroupedOpportunisticSubscriptionIfNeeded();
	}		}

	/**		/**
	@@ -273,8 +316,58 @@ public class MultiSimSettingController extends Handler {
	*/		*/
	private void onSubscriptionsChanged() {		private void onSubscriptionsChanged() {
	if (DBG) log("onSubscriptionsChanged");		if (DBG) log("onSubscriptionsChanged");
	if (!mSubInfoInitialized) return;		reEvaluateAll();
	updateDefaults(/init/ false);		}

			/**
			* Called when carrier config changes on any phone.
			*/
			@VisibleForTesting
			public void notifyCarrierConfigChanged(int phoneId, int subId) {
			obtainMessage(EVENT_CARRIER_CONFIG_CHANGED, phoneId, subId).sendToTarget();
			}

			private void onCarrierConfigChanged(int phoneId, int subId) {
			log("onCarrierConfigChanged phoneId " + phoneId + " subId " + subId);
			if (!SubscriptionManager.isValidPhoneId(phoneId)) {
			loge("Carrier config change with invalid phoneId " + phoneId);
			return;
			}

			mCarrierConfigLoadedSubIds[phoneId] = subId;
			reEvaluateAll();
			}

			private boolean isCarrierConfigLoadedForAllSub() {
			int[] activeSubIds = mSubController.getActiveSubIdList(false);
			for (int activeSubId : activeSubIds) {
			boolean isLoaded = false;
			for (int configLoadedSub : mCarrierConfigLoadedSubIds) {
			if (configLoadedSub == activeSubId) {
			isLoaded = true;
			break;
			}
			}
			if (!isLoaded) {
			if (DBG) log("Carrier config subId " + activeSubId + " is not loaded.");
			return false;
			}
			}

			return true;
			}

			/**
			* Wait for subInfo initialization (after boot up) and carrier config load for all active
			* subscriptions before re-evaluate multi SIM settings.
			*/
			private boolean isReadyToReevaluate() {
			return mSubInfoInitialized && isCarrierConfigLoadedForAllSub();
			}

			private void reEvaluateAll() {
			if (!isReadyToReevaluate()) return;
			updateDefaults();
	disableDataForNonDefaultNonOpportunisticSubscriptions();		disableDataForNonDefaultNonOpportunisticSubscriptions();
	deactivateGroupedOpportunisticSubscriptionIfNeeded();		deactivateGroupedOpportunisticSubscriptionIfNeeded();
	}		}
	@@ -353,12 +446,11 @@ public class MultiSimSettingController extends Handler {
	* not a user settable value anymore.		* not a user settable value anymore.
	* 4) If non above is met, clear the default value to INVALID.		* 4) If non above is met, clear the default value to INVALID.
	*		*
	* @param init whether the subscriptions are just initialized.
	*/		*/
	private void updateDefaults(boolean init) {		private void updateDefaults() {
	if (DBG) log("updateDefaults");		if (DBG) log("updateDefaults");

	if (!mSubInfoInitialized) return;		if (!isReadyToReevaluate()) return;

	List<SubscriptionInfo> activeSubInfos = mSubController		List<SubscriptionInfo> activeSubInfos = mSubController
	.getActiveSubscriptionInfoList(mContext.getOpPackageName());		.getActiveSubscriptionInfoList(mContext.getOpPackageName());
	@@ -372,7 +464,7 @@ public class MultiSimSettingController extends Handler {
	return;		return;
	}		}

	int change = updatePrimarySubListAndGetChangeType(activeSubInfos, init);		int change = updatePrimarySubListAndGetChangeType(activeSubInfos);
	if (DBG) log("[updateDefaultValues] change: " + change);		if (DBG) log("[updateDefaultValues] change: " + change);
	if (change == PRIMARY_SUB_NO_CHANGE) return;		if (change == PRIMARY_SUB_NO_CHANGE) return;

	@@ -414,8 +506,7 @@ public class MultiSimSettingController extends Handler {
	}		}

	@PrimarySubChangeType		@PrimarySubChangeType
	private int updatePrimarySubListAndGetChangeType(List<SubscriptionInfo> activeSubList,		private int updatePrimarySubListAndGetChangeType(List<SubscriptionInfo> activeSubList) {
	boolean init) {
	// Update mPrimarySubList. Opportunistic subscriptions can't be default		// Update mPrimarySubList. Opportunistic subscriptions can't be default
	// data / voice / sms subscription.		// data / voice / sms subscription.
	List<Integer> prevPrimarySubList = mPrimarySubList;		List<Integer> prevPrimarySubList = mPrimarySubList;
	@@ -423,7 +514,10 @@ public class MultiSimSettingController extends Handler {
	.map(info -> info.getSubscriptionId())		.map(info -> info.getSubscriptionId())
	.collect(Collectors.toList());		.collect(Collectors.toList());

	if (init) return PRIMARY_SUB_INITIALIZED;		if (mInitialHandling) {
			mInitialHandling = false;
			return PRIMARY_SUB_INITIALIZED;
			}
	if (mPrimarySubList.equals(prevPrimarySubList)) return PRIMARY_SUB_NO_CHANGE;		if (mPrimarySubList.equals(prevPrimarySubList)) return PRIMARY_SUB_NO_CHANGE;
	if (mPrimarySubList.size() > prevPrimarySubList.size()) return PRIMARY_SUB_ADDED;		if (mPrimarySubList.size() > prevPrimarySubList.size()) return PRIMARY_SUB_ADDED;

	@@ -554,7 +648,7 @@ public class MultiSimSettingController extends Handler {
	}		}

	private void disableDataForNonDefaultNonOpportunisticSubscriptions() {		private void disableDataForNonDefaultNonOpportunisticSubscriptions() {
	if (!mSubInfoInitialized) return;		if (!isReadyToReevaluate()) return;

	int defaultDataSub = mSubController.getDefaultDataSubId();		int defaultDataSub = mSubController.getDefaultDataSubId();

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

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -321,7 +321,7 @@ public class PhoneSwitcher extends Handler {
	// subscription.		// subscription.
	mPhoneIdInVoiceCall = SubscriptionManager.INVALID_PHONE_INDEX;		mPhoneIdInVoiceCall = SubscriptionManager.INVALID_PHONE_INDEX;
	for (Phone phone : mPhones) {		for (Phone phone : mPhones) {
	if (isCallActive(phone) \|\| isCallActive(phone.getImsPhone())) {		if (isPhoneInVoiceCall(phone) \|\| isPhoneInVoiceCall(phone.getImsPhone())) {
	mPhoneIdInVoiceCall = phone.getPhoneId();		mPhoneIdInVoiceCall = phone.getPhoneId();
	break;		break;
	}		}
	@@ -1232,13 +1232,20 @@ public class PhoneSwitcher extends Handler {
	subId, needValidation ? 1 : 0, callback).sendToTarget();		subId, needValidation ? 1 : 0, callback).sendToTarget();
	}		}

	private boolean isCallActive(Phone phone) {		private boolean isPhoneInVoiceCall(Phone phone) {
	if (phone == null) {		if (phone == null) {
	return false;		return false;
	}		}

			// A phone in voice call might trigger data being switched to it.
			// We only report true if its precise call state is ACTIVE, ALERTING or HOLDING.
			// The reason is data switching is interrupting, so we only switch when necessary and
			// acknowledged by the users. For incoming call, we don't switch until answered
			// (RINGING -> ACTIVE), for outgoing call we don't switch until call is connected
			// in network (DIALING -> ALERTING).
	return (phone.getForegroundCall().getState() == Call.State.ACTIVE		return (phone.getForegroundCall().getState() == Call.State.ACTIVE
	\|\| phone.getForegroundCall().getState() == Call.State.ALERTING);		\|\| phone.getForegroundCall().getState() == Call.State.ALERTING
			\|\| phone.getBackgroundCall().getState() == Call.State.HOLDING);
	}		}

	private void updateHalCommandToUse() {		private void updateHalCommandToUse() {

tests/telephonytests/src/com/android/internal/telephony/MultiSimSettingControllerTest.java

+70 −0

Original line number	Original line	Diff line number	Diff line
	@@ -118,6 +118,7 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1, mSubInfo2);		List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1, mSubInfo2);
	doReturn(infoList).when(mSubControllerMock)		doReturn(infoList).when(mSubControllerMock)
	.getActiveSubscriptionInfoList(anyString());		.getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{1, 2}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());

	mPhones = new Phone[] {mPhoneMock1, mPhoneMock2};		mPhones = new Phone[] {mPhoneMock1, mPhoneMock2};
	doReturn(mDataEnabledSettingsMock1).when(mPhoneMock1).getDataEnabledSettings();		doReturn(mDataEnabledSettingsMock1).when(mPhoneMock1).getDataEnabledSettings();
	@@ -175,6 +176,7 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID).when(mPhoneMock2).getSubId();		doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID).when(mPhoneMock2).getSubId();
	List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1);		List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1);
	doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());		doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{1}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());

	// Mark subscription ready as false. The below sub info change should be ignored.		// Mark subscription ready as false. The below sub info change should be ignored.
	mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();		mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();
	@@ -184,6 +186,7 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	verify(mSubControllerMock, never()).setDefaultSmsSubId(anyInt());		verify(mSubControllerMock, never()).setDefaultSmsSubId(anyInt());

	mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();		mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 1);
	waitABit();		waitABit();

	// Sub 1 should be default sub silently.		// Sub 1 should be default sub silently.
	@@ -210,8 +213,10 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID).when(mPhoneMock2).getSubId();		doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID).when(mPhoneMock2).getSubId();
	List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1);		List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1);
	doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());		doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{1}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());

	mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();		mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 1);
	waitABit();		waitABit();

	// Sub 1 should be default sub silently.		// Sub 1 should be default sub silently.
	@@ -223,8 +228,10 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	doReturn(2).when(mPhoneMock1).getSubId();		doReturn(2).when(mPhoneMock1).getSubId();
	infoList = Arrays.asList(mSubInfo2);		infoList = Arrays.asList(mSubInfo2);
	doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());		doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{2}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());

	mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();		mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 2);
	waitABit();		waitABit();

	// Sub 1 should be default sub silently.		// Sub 1 should be default sub silently.
	@@ -244,8 +251,10 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID).when(mPhoneMock2).getSubId();		doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID).when(mPhoneMock2).getSubId();
	List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1);		List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1);
	doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());		doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{1}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());

	mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();		mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 1);
	waitABit();		waitABit();

	// Sub 1 should be default sub silently.		// Sub 1 should be default sub silently.
	@@ -262,8 +271,10 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	doReturn(2).when(mPhoneMock2).getSubId();		doReturn(2).when(mPhoneMock2).getSubId();
	infoList = Arrays.asList(mSubInfo1, mSubInfo2);		infoList = Arrays.asList(mSubInfo1, mSubInfo2);
	doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());		doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{1, 2}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());

	mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();		mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 2);
	waitABit();		waitABit();

	// Intent should be broadcast to ask default data selection.		// Intent should be broadcast to ask default data selection.
	@@ -282,8 +293,10 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	doReturn(3).when(mPhoneMock2).getSubId();		doReturn(3).when(mPhoneMock2).getSubId();
	infoList = Arrays.asList(mSubInfo1, mSubInfo3);		infoList = Arrays.asList(mSubInfo1, mSubInfo3);
	doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());		doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{1, 3}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());

	mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();		mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 3);
	waitABit();		waitABit();

	// Intent should be broadcast to ask default data selection.		// Intent should be broadcast to ask default data selection.
	@@ -300,6 +313,8 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	doReturn(true).when(mPhoneMock2).isUserDataEnabled();		doReturn(true).when(mPhoneMock2).isUserDataEnabled();
	// After initialization, sub 2 should have mobile data off.		// After initialization, sub 2 should have mobile data off.
	mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();		mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 1);
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 2);
	waitABit();		waitABit();
	verify(mDataEnabledSettingsMock2).setUserDataEnabled(false);		verify(mDataEnabledSettingsMock2).setUserDataEnabled(false);

	@@ -323,7 +338,10 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	doReturn(false).when(mSubControllerMock).isActiveSubId(1);		doReturn(false).when(mSubControllerMock).isActiveSubId(1);
	List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo2);		List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo2);
	doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());		doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{2}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());
	mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();		mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(
			1, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
	waitABit();		waitABit();
	verify(mSubControllerMock).setDefaultDataSubId(SubscriptionManager.INVALID_SUBSCRIPTION_ID);		verify(mSubControllerMock).setDefaultDataSubId(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
	verify(mSubControllerMock).setDefaultSmsSubId(SubscriptionManager.INVALID_SUBSCRIPTION_ID);		verify(mSubControllerMock).setDefaultSmsSubId(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
	@@ -346,6 +364,8 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	GlobalSettingsHelper.setBoolean(mContext, Settings.Global.MOBILE_DATA, 2, true);		GlobalSettingsHelper.setBoolean(mContext, Settings.Global.MOBILE_DATA, 2, true);
	GlobalSettingsHelper.setBoolean(mContext, Settings.Global.DATA_ROAMING, 2, false);		GlobalSettingsHelper.setBoolean(mContext, Settings.Global.DATA_ROAMING, 2, false);
	mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();		mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 1);
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 2);
	waitABit();		waitABit();

	// Create subscription grouping.		// Create subscription grouping.
	@@ -391,8 +411,10 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	doReturn(1).when(mSubControllerMock).getDefaultVoiceSubId();		doReturn(1).when(mSubControllerMock).getDefaultVoiceSubId();
	List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1, mSubInfo3);		List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1, mSubInfo3);
	doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());		doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{1, 3}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());

	mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();		mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 3);
	waitABit();		waitABit();

	verify(mSubControllerMock).setDefaultDataSubId(3);		verify(mSubControllerMock).setDefaultDataSubId(3);
	@@ -414,6 +436,8 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	// Notify subscriptions ready. Sub 2 should become the default. But shouldn't turn off		// Notify subscriptions ready. Sub 2 should become the default. But shouldn't turn off
	// data of oppt sub 1.		// data of oppt sub 1.
	mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();		mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 1);
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 2);
	waitABit();		waitABit();
	verify(mSubControllerMock).setDefaultDataSubId(2);		verify(mSubControllerMock).setDefaultDataSubId(2);
	verify(mDataEnabledSettingsMock1, never()).setUserDataEnabled(anyBoolean());		verify(mDataEnabledSettingsMock1, never()).setUserDataEnabled(anyBoolean());
	@@ -451,6 +475,8 @@ public class MultiSimSettingControllerTest extends TelephonyTest {

	// Notify subscriptions ready. Sub 2 should become the default, as sub 1 is opportunistic.		// Notify subscriptions ready. Sub 2 should become the default, as sub 1 is opportunistic.
	mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();		mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 1);
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 2);
	waitABit();		waitABit();
	verify(mSubControllerMock).setDefaultDataSubId(2);		verify(mSubControllerMock).setDefaultDataSubId(2);
	// No user selection needed, no intent should be sent.		// No user selection needed, no intent should be sent.
	@@ -494,6 +520,8 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	GlobalSettingsHelper.setBoolean(mContext, Settings.Global.MOBILE_DATA, 1, true);		GlobalSettingsHelper.setBoolean(mContext, Settings.Global.MOBILE_DATA, 1, true);
	GlobalSettingsHelper.setBoolean(mContext, Settings.Global.DATA_ROAMING, 1, false);		GlobalSettingsHelper.setBoolean(mContext, Settings.Global.DATA_ROAMING, 1, false);
	mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();		mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 1);
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 2);
	waitABit();		waitABit();

	// Create subscription grouping.		// Create subscription grouping.
	@@ -514,4 +542,46 @@ public class MultiSimSettingControllerTest extends TelephonyTest {
	waitABit();		waitABit();
	verify(mDataEnabledSettingsMock2).setUserDataEnabled(false);		verify(mDataEnabledSettingsMock2).setUserDataEnabled(false);
	}		}

			@Test
			@SmallTest
			public void testCarrierConfigLoading() throws Exception {
			doReturn(true).when(mPhoneMock1).isUserDataEnabled();
			doReturn(true).when(mPhoneMock2).isUserDataEnabled();
			// Sub 2 should have mobile data off, but it shouldn't happen until carrier configs are
			// loaded on both subscriptions.
			mMultiSimSettingControllerUT.notifyAllSubscriptionLoaded();
			waitABit();
			verify(mDataEnabledSettingsMock2, never()).setUserDataEnabled(false);
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(0, 1);
			waitABit();
			verify(mDataEnabledSettingsMock2, never()).setUserDataEnabled(false);
			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 2);
			waitABit();
			verify(mDataEnabledSettingsMock2).setUserDataEnabled(false);

			// Switch from sub 2 to sub 3 in phone[1].
			clearInvocations(mSubControllerMock);
			doReturn(false).when(mSubControllerMock).isActiveSubId(2);
			doReturn(true).when(mSubControllerMock).isActiveSubId(3);
			doReturn(SubscriptionManager.INVALID_PHONE_INDEX).when(mSubControllerMock).getPhoneId(2);
			doReturn(1).when(mSubControllerMock).getPhoneId(3);
			doReturn(3).when(mPhoneMock2).getSubId();
			List<SubscriptionInfo> infoList = Arrays.asList(mSubInfo1, mSubInfo3);
			doReturn(infoList).when(mSubControllerMock).getActiveSubscriptionInfoList(anyString());
			doReturn(new int[]{1, 3}).when(mSubControllerMock).getActiveSubIdList(anyBoolean());

			// Nothing should happen until carrier config change is notified on sub 3.
			mMultiSimSettingControllerUT.notifySubscriptionInfoChanged();
			waitABit();
			verify(mContext, never()).sendBroadcast(any());

			mMultiSimSettingControllerUT.notifyCarrierConfigChanged(1, 3);
			waitABit();
			// Intent should be broadcast to ask default data selection.
			Intent intent = captureBroadcastIntent();
			assertEquals(ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED, intent.getAction());
			assertEquals(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA,
			intent.getIntExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE, -1));
			}
	}		}

tests/telephonytests/src/com/android/internal/telephony/PhoneSubInfoControllerTest.java

+3 −0

tests/telephonytests/src/com/android/internal/telephony/PhoneSwitcherTest.java

+16 −1

Original line number	Original line	Diff line number	Diff line
	@@ -91,6 +91,8 @@ public class PhoneSwitcherTest extends TelephonyTest {
	@Mock		@Mock
	private GsmCdmaCall mActiveCall;		private GsmCdmaCall mActiveCall;
	@Mock		@Mock
			private GsmCdmaCall mHoldingCall;
			@Mock
	private GsmCdmaCall mInactiveCall;		private GsmCdmaCall mInactiveCall;

	// The thread that mPhoneSwitcher will handle events in.		// The thread that mPhoneSwitcher will handle events in.
	@@ -116,6 +118,7 @@ public class PhoneSwitcherTest extends TelephonyTest {

	doReturn(Call.State.ACTIVE).when(mActiveCall).getState();		doReturn(Call.State.ACTIVE).when(mActiveCall).getState();
	doReturn(Call.State.IDLE).when(mInactiveCall).getState();		doReturn(Call.State.IDLE).when(mInactiveCall).getState();
			doReturn(Call.State.HOLDING).when(mHoldingCall).getState();
	}		}

	@After		@After
	@@ -572,7 +575,6 @@ public class PhoneSwitcherTest extends TelephonyTest {
	notifyDataEnabled(false);		notifyDataEnabled(false);
	notifyPhoneAsInCall(mPhone2);		notifyPhoneAsInCall(mPhone2);
	verify(mMockRadioConfig, never()).setPreferredDataModem(anyInt(), any());		verify(mMockRadioConfig, never()).setPreferredDataModem(anyInt(), any());
	waitABit();
	assertTrue(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 0));		assertTrue(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 0));
	assertFalse(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 1));		assertFalse(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 1));

	@@ -588,6 +590,13 @@ public class PhoneSwitcherTest extends TelephonyTest {
	verify(mMockRadioConfig).setPreferredDataModem(eq(0), any());		verify(mMockRadioConfig).setPreferredDataModem(eq(0), any());
	assertTrue(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 0));		assertTrue(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 0));
	assertFalse(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 1));		assertFalse(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 1));
			clearInvocations(mMockRadioConfig);

			// Phone2 has holding call, but data is turned off. So no data switching should happen.
			notifyPhoneAsInHoldingCall(mPhone2);
			verify(mMockRadioConfig).setPreferredDataModem(eq(1), any());
			assertTrue(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 1));
			assertFalse(mPhoneSwitcher.shouldApplyNetworkRequest(internetRequest, 0));

	mHandlerThread.quit();		mHandlerThread.quit();
	}		}
	@@ -878,6 +887,12 @@ public class PhoneSwitcherTest extends TelephonyTest {
	waitABit();		waitABit();
	}		}

			private void notifyPhoneAsInHoldingCall(Phone phone) {
			doReturn(mHoldingCall).when(phone).getBackgroundCall();
			mPhoneSwitcher.sendEmptyMessage(EVENT_PRECISE_CALL_STATE_CHANGED);
			waitABit();
			}

	private void notifyPhoneAsInactive(Phone phone) {		private void notifyPhoneAsInactive(Phone phone) {
	doReturn(mInactiveCall).when(phone).getForegroundCall();		doReturn(mInactiveCall).when(phone).getForegroundCall();
	mPhoneSwitcher.sendEmptyMessage(EVENT_PRECISE_CALL_STATE_CHANGED);		mPhoneSwitcher.sendEmptyMessage(EVENT_PRECISE_CALL_STATE_CHANGED);