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

Commit b16f5930 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev

parents 843ddc54 36732e01

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

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.internal.telephony;



import static android.telephony.TelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED;

import static android.telephony.TelephonyManager

        .CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE;

import static android.telephony.TelephonyManager.CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED;
@@ -24,6 +23,7 @@ import static android.telephony.TelephonyManager.CAPABILITY_SECONDARY_LINK_BANDW 
import static android.telephony.TelephonyManager.CAPABILITY_SIM_PHONEBOOK_IN_MODEM;

import static android.telephony.TelephonyManager.CAPABILITY_SLICING_CONFIG_SUPPORTED;

import static android.telephony.TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING;

import static android.telephony.TelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK;

import static android.telephony.TelephonyManager.RadioInterfaceCapability;



import android.hardware.radio.V1_0.RadioError;
@@ -300,8 +300,8 @@ public class RadioConfigResponse extends IRadioConfigResponse.Stub { 


        Rlog.d(TAG, "Radio Hal Version = " + radioHalVersion.toString());

        if (radioHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_6)) {

            caps.add(CAPABILITY_ALLOWED_NETWORK_TYPES_USED);

            Rlog.d(TAG, "CAPABILITY_ALLOWED_NETWORK_TYPES_USED");

            caps.add(CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK);

            Rlog.d(TAG, "CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK");



            if (!modemReducedFeatureSet1) {

                caps.add(CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE);

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

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class RadioConfigResponseTest extends TelephonyTest { 
        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED));

                caps.contains(TelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK));

        assertFalse(

                caps.contains(

                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));
@@ -64,7 +64,7 @@ public class RadioConfigResponseTest extends TelephonyTest { 
        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE));

        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED));

                caps.contains(TelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK));

        assertFalse(

                caps.contains(

                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));
@@ -80,7 +80,7 @@ public class RadioConfigResponseTest extends TelephonyTest { 
        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_SECONDARY_LINK_BANDWIDTH_VISIBLE));

        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED));

                caps.contains(TelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK));

        assertTrue(

                caps.contains(

                        TelephonyManager.CAPABILITY_NR_DUAL_CONNECTIVITY_CONFIGURATION_AVAILABLE));