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

Commit 85694c09 authored by Sarah Chin's avatar Sarah Chin Committed by Jack Yu
Browse files

Use NR configs for minimum NR advanced bandwidth threshold 

Test: manual verify
Test: atest NetworkTypeControllerTest
Bug: 257135958
Bug: 260007418
Merged-In: I41eb1a08e9c04820e4ec188eb6dfd2c7f73ff591
Change-Id: I2912e0321ebd90f8a046adc0dac190443e294b33
parent 610d8d55

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

+10 −3
Original line number Diff line number Diff line
@@ -1261,11 +1261,18 @@ public class NetworkTypeController extends StateMachine { 
            return false;

        }



        int bandwidths = 0;

        if (mPhone.getServiceStateTracker().getPhysicalChannelConfigList() != null) {

            bandwidths = mPhone.getServiceStateTracker().getPhysicalChannelConfigList()

                    .stream()

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

                    .map(PhysicalChannelConfig::getCellBandwidthDownlinkKhz)

                    .mapToInt(Integer::intValue)

                    .sum();

        }

        // Check if meeting minimum bandwidth requirement. For most carriers, there is no minimum

        // bandwidth requirement and mNrAdvancedThresholdBandwidth is 0.

        if (mNrAdvancedThresholdBandwidth > 0

                && IntStream.of(mPhone.getServiceState().getCellBandwidths()).sum()

                < mNrAdvancedThresholdBandwidth) {

        if (mNrAdvancedThresholdBandwidth > 0 && bandwidths < mNrAdvancedThresholdBandwidth) {

            return false;

        }

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

+6 −1
Original line number Diff line number Diff line
@@ -1323,7 +1323,12 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
        doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mServiceState).getDataNetworkType();

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

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

        doReturn(new int[] {20001}).when(mServiceState).getCellBandwidths();

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

        lastPhysicalChannelConfigList.add(new PhysicalChannelConfig.Builder()

                .setNetworkType(TelephonyManager.NETWORK_TYPE_NR)

                .setCellBandwidthDownlinkKhz(20001)

                .build());

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

        mBundle.putInt(CarrierConfigManager.KEY_NR_ADVANCED_THRESHOLD_BANDWIDTH_KHZ_INT, 20000);

        broadcastCarrierConfigs();