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

Commit b34c197d authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Merge "Add UT case for CellSignalStrengthLte#convertRssnrUnitFromTenDbToDB"... 

Merge "Add UT case for CellSignalStrengthLte#convertRssnrUnitFromTenDbToDB" am: eed54602 am: 59d6db39

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

Change-Id: I9a2627db5e29598a61519ad52318143076830cf1
parents eb5d1a94 59d6db39

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

+48 −0
Original line number Original line Diff line number Diff line
@@ -474,6 +474,54 @@ public class SignalStrengthControllerTest extends TelephonyTest { 
                CellSignalStrength.SIGNAL_STRENGTH_MODERATE);

                CellSignalStrength.SIGNAL_STRENGTH_MODERATE);

    }

    }





    @Test

    public void testLteSignalStrengthReportingCriteria_convertRssnrUnitFromTenDbToDB() {

        SignalStrength ss = new SignalStrength(

                new CellSignalStrengthCdma(),

                new CellSignalStrengthGsm(),

                new CellSignalStrengthWcdma(),

                new CellSignalStrengthTdscdma(),

                new CellSignalStrengthLte(

                        -110, /* rssi */

                        -114, /* rsrp */

                        -5, /* rsrq */

                        CellSignalStrengthLte.convertRssnrUnitFromTenDbToDB(-34), /* rssnr */

                        SignalStrength.INVALID, /* cqi */

                        SignalStrength.INVALID /* ta */),

                new CellSignalStrengthNr());



        int[] lteThresholds = {

                -3, // SIGNAL_STRENGTH_POOR

                1, // SIGNAL_STRENGTH_MODERATE

                5, // SIGNAL_STRENGTH_GOOD

                13,  // SIGNAL_STRENGTH_GREAT

        };

        mBundle.putIntArray(CarrierConfigManager.KEY_LTE_RSSNR_THRESHOLDS_INT_ARRAY ,

                lteThresholds);

        mBundle.putInt(CarrierConfigManager.KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT,

                CellSignalStrengthLte.USE_RSSNR);

        sendCarrierConfigUpdate();

        sendSignalStrength(ss);

        assertEquals(CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                mSsc.getSignalStrength().getLevel());



        ss = new SignalStrength(

                new CellSignalStrengthCdma(),

                new CellSignalStrengthGsm(),

                new CellSignalStrengthWcdma(),

                new CellSignalStrengthTdscdma(),

                new CellSignalStrengthLte(

                        -110, /* rssi */

                        -114, /* rsrp */

                        -5, /* rsrq */

                        CellSignalStrengthLte.convertRssnrUnitFromTenDbToDB(129), /* rssnr */

                        SignalStrength.INVALID, /* cqi */

                        SignalStrength.INVALID /* ta */),

                new CellSignalStrengthNr());

        sendSignalStrength(ss);

        assertEquals(CellSignalStrength.SIGNAL_STRENGTH_GOOD, mSsc.getSignalStrength().getLevel());

    }



    @Test

    @Test

    public void test5gNrSignalStrengthReportingCriteria_UseSsRsrp() {

    public void test5gNrSignalStrengthReportingCriteria_UseSsRsrp() {

        SignalStrength ss = new SignalStrength(

        SignalStrength ss = new SignalStrength(