Merge "Add list of subIds to cellular networks" (d6e28f4f) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ import java.net.UnknownHostException;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collection;
		import java.util.Collections;
		import java.util.List;
		import java.util.Locale;
		import java.util.Map;
		@@ -1808,6 +1809,7 @@ public class DataConnection extends StateMachine {

		builder.setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()
		.setSubscriptionId(mSubId).build());
		builder.setSubIds(Collections.singleton(mSubId));

		if (!mPhone.getServiceState().getDataRoaming()) {
		builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);

+11 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ import org.mockito.Mock;
		import java.lang.reflect.Field;
		import java.lang.reflect.Method;
		import java.util.Arrays;
		import java.util.Collections;

		public class DataConnectionTest extends TelephonyTest {

		@@ -709,6 +710,16 @@ public class DataConnectionTest extends TelephonyTest {
		assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));
		}

		@Test
		public void testSubIds() throws Exception {
		mContextFixture.getCarrierConfigBundle().putStringArray(
		CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,
		new String[] { "default" });
		testConnectEvent();

		assertEquals(Collections.singleton(0), getNetworkCapabilities().getSubIds());
		}

		@Test
		public void testShouldSkip464Xlat() throws Exception {
		assertFalse(testShouldSkip464XlatEvent(mApn1));