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

Commit e175b76d authored by Sarah Chin's avatar Sarah Chin
Browse files

Update bandwidth threshhold for NR advanced 

Bandwidth threshhold for NR advanced should be inclusive

Test: atest NetworkTypeControllerTest
Test: basic sanity tests
Bug: 297102081
Change-Id: Iefcb05817d746714b5b397188ccf4ff60bb9bb93
parent 13cbe364

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

+1 −1
Original line number Diff line number Diff line
@@ -1365,7 +1365,7 @@ public class NetworkTypeController extends StateMachine { 
        // Check if meeting minimum bandwidth requirement. For most carriers, there is no minimum

        // bandwidth requirement and mNrAdvancedThresholdBandwidth is 0.

        if (mNrAdvancedThresholdBandwidth > 0

                && mRatchetedNrBandwidths <= mNrAdvancedThresholdBandwidth) {

                && mRatchetedNrBandwidths < mNrAdvancedThresholdBandwidth) {

            if (DBG) {

                log("isNrAdvanced: false because bandwidths=" + mRatchetedNrBandwidths

                        + " does not meet the threshold=" + mNrAdvancedThresholdBandwidth);

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

+2 −2
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
                .setNetworkType(TelephonyManager.NETWORK_TYPE_NR)

                .setPhysicalCellId(1)

                .setCellConnectionStatus(CellInfo.CONNECTION_PRIMARY_SERVING)

                .setCellBandwidthDownlinkKhz(20000)

                .setCellBandwidthDownlinkKhz(19999)

                .build();

        // Secondary serving NR PCC with cell ID = 2, band = 41, bandwidth = 10000

        PhysicalChannelConfig pcc2 = new PhysicalChannelConfig.Builder()
@@ -1376,7 +1376,7 @@ public class NetworkTypeControllerTest extends TelephonyTest { 
                .setNetworkType(TelephonyManager.NETWORK_TYPE_NR)

                .setCellConnectionStatus(CellInfo.CONNECTION_PRIMARY_SERVING)

                .setPhysicalCellId(1)

                .setCellBandwidthDownlinkKhz(20000)

                .setCellBandwidthDownlinkKhz(19999)

                .build());

        lastPhysicalChannelConfigList.add(new PhysicalChannelConfig.Builder()

                .setNetworkType(TelephonyManager.NETWORK_TYPE_LTE)