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

Commit 904835f0 authored by Sarah Chin's avatar Sarah Chin Committed by Jack Yu
Browse files

Add carrier config to use both NR and LTE bands for NR advanced threshold 

Test: atest NetworkTypeControllerTest
Bug: 260052715
Merged-In: If797df389455f7ccbf0befd2d205962f4fea8060
Change-Id: I97e2f77e2b76f6ec94a0d33a722005e6675d5f1b
parent 85694c09

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

+9 −1
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ public class NetworkTypeController extends StateMachine { 
    private boolean mIsTimerResetEnabledForLegacyStateRRCIdle;

    private int mLtePlusThresholdBandwidth;

    private int mNrAdvancedThresholdBandwidth;

    private boolean mIncludeLteForNrAdvancedThresholdBandwidth;

    private int[] mAdditionalNrAdvancedBandsList;

    private String mPrimaryTimerState;

    private String mSecondaryTimerState;
@@ -267,6 +268,9 @@ public class NetworkTypeController extends StateMachine { 
                CarrierConfigManager.KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT);

        mNrAdvancedThresholdBandwidth = CarrierConfigManager.getDefaultConfig().getInt(

                CarrierConfigManager.KEY_NR_ADVANCED_THRESHOLD_BANDWIDTH_KHZ_INT);

        mIncludeLteForNrAdvancedThresholdBandwidth = CarrierConfigManager.getDefaultConfig()

                .getBoolean(CarrierConfigManager

                        .KEY_INCLUDE_LTE_FOR_NR_ADVANCED_THRESHOLD_BANDWIDTH_BOOL);

        mEnableNrAdvancedWhileRoaming = CarrierConfigManager.getDefaultConfig().getBoolean(

                CarrierConfigManager.KEY_ENABLE_NR_ADVANCED_WHILE_ROAMING_BOOL);
@@ -302,6 +306,9 @@ public class NetworkTypeController extends StateMachine { 
                mNrAdvancedThresholdBandwidth = b.getInt(

                        CarrierConfigManager.KEY_NR_ADVANCED_THRESHOLD_BANDWIDTH_KHZ_INT,

                        mNrAdvancedThresholdBandwidth);

                mIncludeLteForNrAdvancedThresholdBandwidth = b.getBoolean(CarrierConfigManager

                        .KEY_INCLUDE_LTE_FOR_NR_ADVANCED_THRESHOLD_BANDWIDTH_BOOL,

                        mIncludeLteForNrAdvancedThresholdBandwidth);

                mAdditionalNrAdvancedBandsList = b.getIntArray(

                        CarrierConfigManager.KEY_ADDITIONAL_NR_ADVANCED_BANDS_INT_ARRAY);

                mNrAdvancedCapablePcoId = b.getInt(
@@ -1265,7 +1272,8 @@ public class NetworkTypeController extends StateMachine { 
        if (mPhone.getServiceStateTracker().getPhysicalChannelConfigList() != null) {

            bandwidths = mPhone.getServiceStateTracker().getPhysicalChannelConfigList()

                    .stream()

                    .filter(config -> config.getNetworkType() == TelephonyManager.NETWORK_TYPE_NR)

                    .filter(config -> mIncludeLteForNrAdvancedThresholdBandwidth

                            || config.getNetworkType() == TelephonyManager.NETWORK_TYPE_NR)

                    .map(PhysicalChannelConfig::getCellBandwidthDownlinkKhz)

                    .mapToInt(Integer::intValue)

                    .sum();

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

+28 −0
Original line number Diff line number Diff line
@@ -1337,6 +1337,34 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        assertEquals("connected_mmwave", getCurrentState().getName());

    }



    @Test

    public void testTransitionToCurrentStateNrConnectedWithHighBandwidthIncludingLte()

            throws Exception {

        assertEquals("DefaultState", getCurrentState().getName());

        doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mServiceState).getDataNetworkType();

        doReturn(NetworkRegistrationInfo.NR_STATE_CONNECTED).when(mServiceState).getNrState();

        doReturn(ServiceState.FREQUENCY_RANGE_MMWAVE).when(mServiceState).getNrFrequencyRange();

        List<PhysicalChannelConfig> lastPhysicalChannelConfigList = new ArrayList<>();

        lastPhysicalChannelConfigList.add(new PhysicalChannelConfig.Builder()

                .setNetworkType(TelephonyManager.NETWORK_TYPE_NR)

                .setCellBandwidthDownlinkKhz(20000)

                .build());

        lastPhysicalChannelConfigList.add(new PhysicalChannelConfig.Builder()

                .setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)

                .setCellBandwidthDownlinkKhz(10000)

                .build());

        doReturn(lastPhysicalChannelConfigList).when(mSST).getPhysicalChannelConfigList();

        mBundle.putInt(CarrierConfigManager.KEY_NR_ADVANCED_THRESHOLD_BANDWIDTH_KHZ_INT, 20000);

        mBundle.putBoolean(

                CarrierConfigManager.KEY_INCLUDE_LTE_FOR_NR_ADVANCED_THRESHOLD_BANDWIDTH_BOOL,

                true);

        broadcastCarrierConfigs();



        mNetworkTypeController.sendMessage(NetworkTypeController.EVENT_UPDATE);

        processAllMessages();

        assertEquals("connected_mmwave", getCurrentState().getName());

    }



    @Test

    public void testNrAdvancedDisabledWhileRoaming() throws Exception {

        assertEquals("DefaultState", getCurrentState().getName());