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

Commit 825a7dc8 authored by Benedict Wong's avatar Benedict Wong
Browse files

Add list of subIds to cellular networks 

This change populates the subId set in NetworkCapabilities for each data
connection

Bug: 181618700
Test: atest FrameworksTelephonyTests:DataConnectionTest
Change-Id: I132c4b9a6d0225bb43e0417b4e80399edd4718b2
parent 6b2dca3c

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,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;
@@ -1807,6 +1808,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
@@ -85,6 +85,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 {
@@ -720,6 +721,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));