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

Commit aebc2bbc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[VCN19.1] Rename get/setSubIds to get/setSubscriptionIds" am: 2d0c7bca 

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

Change-Id: Ie8560e26af2035d6a6a1cffc2ff8e3d4cabc53ef
parents 53c23524 2d0c7bca

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

+1 −1
Original line number Diff line number Diff line
@@ -1853,7 +1853,7 @@ public class DataConnection extends StateMachine { 


        builder.setNetworkSpecifier(new TelephonyNetworkSpecifier.Builder()

                .setSubscriptionId(mSubId).build());

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

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



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

            builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);

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

+2 −2
Original line number Diff line number Diff line
@@ -826,13 +826,13 @@ public class DataConnectionTest extends TelephonyTest { 
    }



    @Test

    public void testSubIds() throws Exception {

    public void testSubscriptionIds() throws Exception {

        mContextFixture.getCarrierConfigBundle().putStringArray(

                CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,

                new String[] { "default" });

        testConnectEvent();



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

        assertEquals(Collections.singleton(0), getNetworkCapabilities().getSubscriptionIds());

    }



    @Test