Snap for 7898627 from 5c2782234b3fd98085275292fc871a91234a09ff to sc-v2-release (bdb3be7c) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+18 −3

Original line number	Diff line number	Diff line
		@@ -906,6 +906,19 @@ public class SubscriptionController extends ISub.Stub {
		@Override
		public List<SubscriptionInfo> getAllSubInfoList(String callingPackage,
		String callingFeatureId) {
		return getAllSubInfoList(callingPackage, callingFeatureId, false);
		}

		/**
		* @param callingPackage The package making the IPC.
		* @param callingFeatureId The feature in the package
		* @param skipConditionallyRemoveIdentifier if set, skip removing identifier conditionally
		* @return List of all SubscriptionInfo records in database,
		* include those that were inserted before, maybe empty but not null.
		* @hide
		*/
		public List<SubscriptionInfo> getAllSubInfoList(String callingPackage,
		String callingFeatureId, boolean skipConditionallyRemoveIdentifier) {
		if (VDBG) logd("[getAllSubInfoList]+");

		// This API isn't public, so no need to provide a valid subscription ID - we're not worried
		@@ -924,9 +937,9 @@ public class SubscriptionController extends ISub.Stub {
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		if (subList != null) {
		if (subList != null && !skipConditionallyRemoveIdentifier) {
		if (VDBG) logd("[getAllSubInfoList]- " + subList.size() + " infos return");
		subList.stream().map(
		subList = subList.stream().map(
		subscriptionInfo -> conditionallyRemoveIdentifiers(subscriptionInfo,
		callingPackage, callingFeatureId, "getAllSubInfoList"))
		.collect(Collectors.toList());
		@@ -3900,8 +3913,10 @@ public class SubscriptionController extends ISub.Stub {
		List<SubscriptionInfo> subInfoList;

		try {
		// need to bypass removing identifier check because that will remove the subList without
		// group id.
		subInfoList = getAllSubInfoList(mContext.getOpPackageName(),
		mContext.getAttributionTag());
		mContext.getAttributionTag(), true);
		if (groupUuid == null \|\| subInfoList == null \|\| subInfoList.isEmpty()) {
		return new ArrayList<>();
		}

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

+288 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,8 @@ public class TelephonyRegistryTest extends TelephonyTest {
		private TelephonyDisplayInfo mTelephonyDisplayInfo;
		private int mSrvccState = -1;
		private int mRadioPowerState = RADIO_POWER_UNAVAILABLE;
		private int mDataConnectionState = TelephonyManager.DATA_UNKNOWN;
		private int mNetworkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
		private List<PhysicalChannelConfig> mPhysicalChannelConfigs;
		private TelephonyRegistry.ConfigurationProvider mMockConfigurationProvider;
		private CellLocation mCellLocation;
		@@ -155,6 +157,7 @@ public class TelephonyRegistryTest extends TelephonyTest {
		TelephonyCallback.ActiveDataSubscriptionIdListener,
		TelephonyCallback.RadioPowerStateListener,
		TelephonyCallback.PreciseDataConnectionStateListener,
		TelephonyCallback.DataConnectionStateListener,
		TelephonyCallback.DisplayInfoListener,
		TelephonyCallback.LinkCapacityEstimateChangedListener,
		TelephonyCallback.PhysicalChannelConfigListener,
		@@ -189,6 +192,12 @@ public class TelephonyRegistryTest extends TelephonyTest {
		invocationCount.incrementAndGet();
		}
		@Override
		public void onDataConnectionStateChanged(int state, int networkType) {
		invocationCount.incrementAndGet();
		mDataConnectionState = state;
		mNetworkType = networkType;
		}
		@Override
		public void onDisplayInfoChanged(TelephonyDisplayInfo displayInfo) {
		mTelephonyDisplayInfo = displayInfo;
		}
		@@ -373,6 +382,285 @@ public class TelephonyRegistryTest extends TelephonyTest {
		assertEquals(RADIO_POWER_OFF, mRadioPowerState);
		}

		/**
		* Test {@link TelephonyCallback.DataConnectionStateListener}
		*/
		@Test
		public void testDataConnectionStateChanged() {
		final int subId = 1;
		int[] events = {TelephonyCallback.EVENT_DATA_CONNECTION_STATE_CHANGED};
		doReturn(mMockSubInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
		doReturn(0/slotIndex/).when(mMockSubInfo).getSimSlotIndex();

		assertEquals(TelephonyManager.DATA_UNKNOWN, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_UNKNOWN, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_CONNECTED)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT)
		.setApnName("default")
		.setEntryName("default")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());
		mTelephonyRegistry.listenWithEventList(subId, mContext.getOpPackageName(),
		mContext.getAttributionTag(), mTelephonyCallback.callback, events, true);

		assertEquals(TelephonyManager.DATA_CONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_DISCONNECTING)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT)
		.setApnName("default")
		.setEntryName("default")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_DISCONNECTING, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_DISCONNECTED)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT)
		.setApnName("default")
		.setEntryName("default")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_DISCONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);
		}

		/**
		* Test the scenario that multiple PDNs support default type APN scenario. Make sure it reports
		* aggregate data connection state.
		*/
		@Test
		public void testDataConnectionStateChangedMultipleInternet() {
		final int subId = 1;
		int[] events = {TelephonyCallback.EVENT_DATA_CONNECTION_STATE_CHANGED};
		doReturn(mMockSubInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
		doReturn(0/slotIndex/).when(mMockSubInfo).getSimSlotIndex();

		assertEquals(TelephonyManager.DATA_UNKNOWN, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_UNKNOWN, mNetworkType);

		mTelephonyRegistry.listenWithEventList(subId, mContext.getOpPackageName(),
		mContext.getAttributionTag(), mTelephonyCallback.callback, events, true);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_CONNECTED)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT)
		.setApnName("default")
		.setEntryName("default")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_CONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_CONNECTING)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT \| ApnSetting.TYPE_MMS)
		.setApnName("default+mms")
		.setEntryName("default+mms")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_CONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_DISCONNECTING)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT \| ApnSetting.TYPE_MMS)
		.setApnName("default+mms")
		.setEntryName("default+mms")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());
		assertEquals(TelephonyManager.DATA_CONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_DISCONNECTED)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT \| ApnSetting.TYPE_MMS)
		.setApnName("default+mms")
		.setEntryName("default+mms")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());
		assertEquals(TelephonyManager.DATA_CONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_CONNECTING)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT \| ApnSetting.TYPE_MMS)
		.setApnName("default+mms")
		.setEntryName("default+mms")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_CONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_CONNECTED)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT \| ApnSetting.TYPE_MMS)
		.setApnName("default+mms")
		.setEntryName("default+mms")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_CONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_DISCONNECTING)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT)
		.setApnName("default")
		.setEntryName("default")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_CONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_DISCONNECTING)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT \| ApnSetting.TYPE_MMS)
		.setApnName("default+mms")
		.setEntryName("default+mms")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_DISCONNECTING, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_DISCONNECTED)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT)
		.setApnName("default")
		.setEntryName("default")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_DISCONNECTING, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);

		mTelephonyRegistry.notifyDataConnectionForSubscriber(
		/phoneId/ 0, subId,
		new PreciseDataConnectionState.Builder()
		.setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
		.setId(1)
		.setState(TelephonyManager.DATA_DISCONNECTED)
		.setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)
		.setApnSetting(new ApnSetting.Builder()
		.setApnTypeBitmask(ApnSetting.TYPE_DEFAULT \| ApnSetting.TYPE_MMS)
		.setApnName("default+mms")
		.setEntryName("default+mms")
		.build())
		.setLinkProperties(new LinkProperties())
		.setFailCause(0)
		.build());

		assertEquals(TelephonyManager.DATA_DISCONNECTED, mDataConnectionState);
		assertEquals(TelephonyManager.NETWORK_TYPE_LTE, mNetworkType);
		}

		/**
		* Test multi sim config change.
		*/