Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a549641e authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Add list of subIds to cellular networks" am: d6e28f4f am: c9e9395c am: 204fee93 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1643624

Change-Id: I8b7e9398da3110ab74ccf7f66c018a4d4d9b708b
parents 463e2bba 204fee93

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ import java.net.UnknownHostException; 
import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;

import java.util.Collection;

import java.util.Collection;

import java.util.Collections;

import java.util.List;

import java.util.List;

import java.util.Locale;

import java.util.Locale;

import java.util.Map;

import java.util.Map;
@@ -1895,6 +1896,7 @@ public class DataConnection extends StateMachine { 




        builder.setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

        builder.setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                .setSubscriptionId(mSubId).build());

                .setSubscriptionId(mSubId).build());

        builder.setSubIds(Collections.singleton(mSubId));





        if (!mPhone.getServiceState().getDataRoaming()) {

        if (!mPhone.getServiceState().getDataRoaming()) {

            builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);

            builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ import org.mockito.Mock; 
import java.lang.reflect.Field;

import java.lang.reflect.Field;

import java.lang.reflect.Method;

import java.lang.reflect.Method;

import java.util.Arrays;

import java.util.Arrays;

import java.util.Collections;





public class DataConnectionTest extends TelephonyTest {

public class DataConnectionTest extends TelephonyTest {

    private static final int DEFAULT_DC_CID = 10;

    private static final int DEFAULT_DC_CID = 10;
@@ -824,6 +825,16 @@ public class DataConnectionTest extends TelephonyTest { 
        assertTrue(getNetworkCapabilities().hasCapability(NET_CAPABILITY_NOT_CONGESTED));

        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

    @Test

    public void testShouldSkip464Xlat() throws Exception {

    public void testShouldSkip464Xlat() throws Exception {

        assertFalse(testShouldSkip464XlatEvent(mApn1));

        assertFalse(testShouldSkip464XlatEvent(mApn1));