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

Commit 353063f5 authored by Shuo Qian's avatar Shuo Qian
Browse files

Change the threshold of Signal Strength RSSNR from 10*db to db 

Test: SignalStrengthTest
Bug: 158539126
Change-Id: I98b4e47370a522990d1de45978e2c698f1d674ff
parent c9a61616

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

+5 −5
Original line number Diff line number Diff line
@@ -854,15 +854,15 @@ public class DeviceStateMonitor extends Handler { 
        };



        /**

         * List of default 10*dB RSSNR thresholds for EUTRAN {@link AccessNetworkType}.

         * List of default dB RSSNR thresholds for EUTRAN {@link AccessNetworkType}.

         *

         * These thresholds are taken from the LTE RSSNR defaults in {@link CarrierConfigManager}.

         */

        public static final int[] EUTRAN_RSSNR = new int[] {

            -30,  /* SIGNAL_STRENGTH_POOR */

            10,   /* SIGNAL_STRENGTH_MODERATE */

            45,   /* SIGNAL_STRENGTH_GOOD */

            130   /* SIGNAL_STRENGTH_GREAT */

            -3,  /* SIGNAL_STRENGTH_POOR */

            1,   /* SIGNAL_STRENGTH_MODERATE */

            5,   /* SIGNAL_STRENGTH_GOOD */

            13   /* SIGNAL_STRENGTH_GREAT */

        };



        /**

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

+39 −39
Original line number Diff line number Diff line
@@ -57,10 +57,10 @@ public class SignalStrengthTest { 
            -12 }; // SIGNAL_STRENGTH_GREAT



    private static final int[] DEFAULT_LTE_RSSNR_THRESHOLDS = {

            -30,   // SIGNAL_STRENGTH_POOR

            10,    // SIGNAL_STRENGTH_MODERATE

            45,    // SIGNAL_STRENGTH_GOOD

            130 }; // SIGNAL_STRENGTH_GREAT

            -3,   // SIGNAL_STRENGTH_POOR

            1,    // SIGNAL_STRENGTH_MODERATE

            5,    // SIGNAL_STRENGTH_GOOD

            13 }; // SIGNAL_STRENGTH_GREAT



    private static final int[] DEFAULT_5G_NR_SSRSRP_THRESHOLDS = {

            -125,  // SIGNAL_STRENGTH_POOR
@@ -244,20 +244,20 @@ public class SignalStrengthTest { 
        ss = createSignalStrengthLteReportRsrq(-60, -35);

        assertEquals(SignalStrength.INVALID, ss.getLteRsrq());



        // Input value of RSSNR: 301[dB]

        ss = createSignalStrengthLteReportRssnr(-60, 301);

        // Input value of RSSNR: 31[dB]

        ss = createSignalStrengthLteReportRssnr(-60, 31);

        assertEquals(SignalStrength.INVALID, ss.getLteRssnr());



        // Input value of RSSNR: 300[dB]

        ss = createSignalStrengthLteReportRssnr(-60, 300);

        assertEquals(300, ss.getLteRssnr());

        // Input value of RSSNR: 30[dB]

        ss = createSignalStrengthLteReportRssnr(-60, 30);

        assertEquals(30, ss.getLteRssnr());



        // Input value of RSSNR: -200[dB]

        ss = createSignalStrengthLteReportRssnr(60, -200);

        assertEquals(-200, ss.getLteRssnr());

        // Input value of RSSNR: -20[dB]

        ss = createSignalStrengthLteReportRssnr(60, -20);

        assertEquals(-20, ss.getLteRssnr());



        // Input value of RSSNR: -201[dB]

        ss = createSignalStrengthLteReportRssnr(60, -201);

        // Input value of RSSNR: -21[dB]

        ss = createSignalStrengthLteReportRssnr(60, -21);

        assertEquals(SignalStrength.INVALID, ss.getLteRssnr());

    }
@@ -334,71 +334,71 @@ public class SignalStrengthTest { 
    @Test

    public void testRssnrThresholds_rsrp_great() throws Exception {

        assertEquals(SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                createSignalStrengthLteReportRssnr(-98, -200).getLteLevel());

                createSignalStrengthLteReportRssnr(-98, -20).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_POOR,

                createSignalStrengthLteReportRssnr(-98, -30).getLteLevel());

                createSignalStrengthLteReportRssnr(-98, -3).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_MODERATE,

                createSignalStrengthLteReportRssnr(-98, 10).getLteLevel());

                createSignalStrengthLteReportRssnr(-98, 1).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_GOOD,

                createSignalStrengthLteReportRssnr(-98, 45).getLteLevel());

                createSignalStrengthLteReportRssnr(-98, 5).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_GREAT,

                createSignalStrengthLteReportRssnr(-98, 130).getLteLevel());

                createSignalStrengthLteReportRssnr(-98, 13).getLteLevel());

    }



    @Test

    public void testRssnrThresholds_rsrp_good() throws Exception {

        assertEquals(SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                createSignalStrengthLteReportRssnr(-108, -200).getLteLevel());

                createSignalStrengthLteReportRssnr(-108, -20).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_POOR,

                createSignalStrengthLteReportRssnr(-108, -30).getLteLevel());

                createSignalStrengthLteReportRssnr(-108, -3).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_MODERATE,

                createSignalStrengthLteReportRssnr(-108, 10).getLteLevel());

                createSignalStrengthLteReportRssnr(-108, 1).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_GOOD,

                createSignalStrengthLteReportRssnr(-108, 45).getLteLevel());

                createSignalStrengthLteReportRssnr(-108, 5).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_GOOD,

                createSignalStrengthLteReportRssnr(-108, 130).getLteLevel());

                createSignalStrengthLteReportRssnr(-108, 13).getLteLevel());

    }



    @Test

    public void testRssnrThresholds_rsrp_moderate() throws Exception {

        assertEquals(SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                createSignalStrengthLteReportRssnr(-118, -200).getLteLevel());

                createSignalStrengthLteReportRssnr(-118, -20).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_POOR,

                createSignalStrengthLteReportRssnr(-118, -30).getLteLevel());

                createSignalStrengthLteReportRssnr(-118, -3).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_MODERATE,

                createSignalStrengthLteReportRssnr(-118, 10).getLteLevel());

                createSignalStrengthLteReportRssnr(-118, 1).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_MODERATE,

                createSignalStrengthLteReportRssnr(-118, 45).getLteLevel());

                createSignalStrengthLteReportRssnr(-118, 5).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_MODERATE,

                createSignalStrengthLteReportRssnr(-118, 130).getLteLevel());

                createSignalStrengthLteReportRssnr(-118, 13).getLteLevel());

    }



    @Test

    public void testRssnrThresholds_rsrp_poor() throws Exception {

        assertEquals(SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                createSignalStrengthLteReportRssnr(-128, -200).getLteLevel());

                createSignalStrengthLteReportRssnr(-128, -20).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_POOR,

                createSignalStrengthLteReportRssnr(-128, -30).getLteLevel());

                createSignalStrengthLteReportRssnr(-128, -3).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_POOR,

                createSignalStrengthLteReportRssnr(-128, 10).getLteLevel());

                createSignalStrengthLteReportRssnr(-128, 1).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_POOR,

                createSignalStrengthLteReportRssnr(-128, 45).getLteLevel());

                createSignalStrengthLteReportRssnr(-128, 5).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_POOR,

                createSignalStrengthLteReportRssnr(-128, 130).getLteLevel());

                createSignalStrengthLteReportRssnr(-128, 13).getLteLevel());

    }



    @Test

    public void testRssnrThresholds_rsrp_unknown() throws Exception {

        assertEquals(SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                createSignalStrengthLteReportRssnr(-138, -200).getLteLevel());

                createSignalStrengthLteReportRssnr(-138, -20).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                createSignalStrengthLteReportRssnr(-138, -30).getLteLevel());

                createSignalStrengthLteReportRssnr(-138, -3).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                createSignalStrengthLteReportRssnr(-138, 10).getLteLevel());

                createSignalStrengthLteReportRssnr(-138, 1).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                createSignalStrengthLteReportRssnr(-138, 45).getLteLevel());

                createSignalStrengthLteReportRssnr(-138, 5).getLteLevel());

        assertEquals(SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN,

                createSignalStrengthLteReportRssnr(-138, 130).getLteLevel());

                createSignalStrengthLteReportRssnr(-138, 13).getLteLevel());

    }

}

tests/telephonytests/src/com/android/internal/telephony/metrics/CallQualityMetricsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ public class CallQualityMetricsTest extends TelephonyTest { 
        // save good quality with high rssnr

        CallQuality cq1 = constructCallQuality(CallQuality.CALL_QUALITY_EXCELLENT,

                CallQuality.CALL_QUALITY_EXCELLENT, 5000);

        int rssnr1 = 300;

        int rssnr1 = 30;

        // ignore everything except rssnr

        CellSignalStrengthLte lteSs1 = new CellSignalStrengthLte(0, 0, 0, rssnr1, 0, 0);

        SignalStrength ss1 = new SignalStrength(
@@ -270,7 +270,7 @@ public class CallQualityMetricsTest extends TelephonyTest { 
        // save good quality with low rssnr

        CallQuality cq2 = constructCallQuality(CallQuality.CALL_QUALITY_EXCELLENT,

                CallQuality.CALL_QUALITY_EXCELLENT, 10000);

        int rssnr2 = -200;

        int rssnr2 = -20;

        // ignore everything except rssnr

        CellSignalStrengthLte lteSs2 = new CellSignalStrengthLte(0, 0, 0, rssnr2, 0, 0);

        SignalStrength ss2 = new SignalStrength(