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

Commit 8ed9b2b2 authored by Shuo Qian's avatar Shuo Qian
Browse files

Add VDBG for CellSignalStrengthLte, and CellSignalStrengthNr 

Test: Manual; treehugger;
Bug: 146498052
Bug: 147439337
Change-Id: I37acc63fa3a10aaa21db987980becc57b5365e5c
parent 1f0cb0ac

telephony/java/android/telephony/CellSignalStrengthLte.java

+24 −7
Original line number Original line Diff line number Diff line
@@ -244,19 +244,30 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P 
        } else {

        } else {

            mParametersUseForLevel = cc.getInt(

            mParametersUseForLevel = cc.getInt(

                    CarrierConfigManager.KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT);

                    CarrierConfigManager.KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT);

            if (DBG) {

                Rlog.i(LOG_TAG, "Using signal strength level: " + mParametersUseForLevel);

                Rlog.i(LOG_TAG, "Using signal strength level: " + mParametersUseForLevel);

            }

            rsrpThresholds = cc.getIntArray(

            rsrpThresholds = cc.getIntArray(

                    CarrierConfigManager.KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY);

                    CarrierConfigManager.KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY);

            if (rsrpThresholds == null) rsrpThresholds = sRsrpThresholds;

            if (rsrpThresholds == null) rsrpThresholds = sRsrpThresholds;

            Rlog.i(LOG_TAG, "Applying LTE RSRP Thresholds: " + Arrays.toString(rsrpThresholds));

            if (DBG) {

                Rlog.i(LOG_TAG, "Applying LTE RSRP Thresholds: "

                        + Arrays.toString(rsrpThresholds));

            }

            rsrqThresholds = cc.getIntArray(

            rsrqThresholds = cc.getIntArray(

                    CarrierConfigManager.KEY_LTE_RSRQ_THRESHOLDS_INT_ARRAY);

                    CarrierConfigManager.KEY_LTE_RSRQ_THRESHOLDS_INT_ARRAY);

            if (rsrqThresholds == null) rsrqThresholds = sRsrqThresholds;

            if (rsrqThresholds == null) rsrqThresholds = sRsrqThresholds;

            Rlog.i(LOG_TAG, "Applying LTE RSRQ Thresholds: " + Arrays.toString(rsrqThresholds));

            if (DBG) {

                Rlog.i(LOG_TAG, "Applying LTE RSRQ Thresholds: "

                        + Arrays.toString(rsrqThresholds));

            }

            rssnrThresholds = cc.getIntArray(

            rssnrThresholds = cc.getIntArray(

                    CarrierConfigManager.KEY_LTE_RSSNR_THRESHOLDS_INT_ARRAY);

                    CarrierConfigManager.KEY_LTE_RSSNR_THRESHOLDS_INT_ARRAY);

            if (rssnrThresholds == null) rssnrThresholds = sRssnrThresholds;

            if (rssnrThresholds == null) rssnrThresholds = sRssnrThresholds;

            Rlog.i(LOG_TAG, "Applying LTE RSSNR Thresholds: " + Arrays.toString(rssnrThresholds));

            if (DBG) {

                Rlog.i(LOG_TAG, "Applying LTE RSSNR Thresholds: "

                        + Arrays.toString(rssnrThresholds));

            }

            rsrpOnly = cc.getBoolean(

            rsrpOnly = cc.getBoolean(

                    CarrierConfigManager.KEY_USE_ONLY_RSRP_FOR_LTE_SIGNAL_BAR_BOOL, false);

                    CarrierConfigManager.KEY_USE_ONLY_RSRP_FOR_LTE_SIGNAL_BAR_BOOL, false);

        }

        }
@@ -283,16 +294,22 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P 




        if (isLevelForParameter(USE_RSRP)) {

        if (isLevelForParameter(USE_RSRP)) {

            rsrpLevel = updateLevelWithMeasure(rsrp, rsrpThresholds);

            rsrpLevel = updateLevelWithMeasure(rsrp, rsrpThresholds);

            if (DBG) {

                Rlog.i(LOG_TAG, "Updated 4G LTE RSRP Level: " + rsrpLevel);

                Rlog.i(LOG_TAG, "Updated 4G LTE RSRP Level: " + rsrpLevel);

            }

            }

        }

        if (isLevelForParameter(USE_RSRQ)) {

        if (isLevelForParameter(USE_RSRQ)) {

            rsrqLevel = updateLevelWithMeasure(mRsrq, rsrqThresholds);

            rsrqLevel = updateLevelWithMeasure(mRsrq, rsrqThresholds);

            if (DBG) {

                Rlog.i(LOG_TAG, "Updated 4G LTE RSRQ Level: " + rsrqLevel);

                Rlog.i(LOG_TAG, "Updated 4G LTE RSRQ Level: " + rsrqLevel);

            }

            }

        }

        if (isLevelForParameter(USE_RSSNR)) {

        if (isLevelForParameter(USE_RSSNR)) {

            rssnrLevel = updateLevelWithMeasure(mRssnr, rssnrThresholds);

            rssnrLevel = updateLevelWithMeasure(mRssnr, rssnrThresholds);

            if (DBG) {

                Rlog.i(LOG_TAG, "Updated 4G LTE RSSNR Level: " + rssnrLevel);

                Rlog.i(LOG_TAG, "Updated 4G LTE RSSNR Level: " + rssnrLevel);

            }

            }

        }

        // Apply the smaller value among three levels of three measures.

        // Apply the smaller value among three levels of three measures.

        mLevel = Math.min(Math.min(rsrpLevel, rsrqLevel), rssnrLevel);

        mLevel = Math.min(Math.min(rsrpLevel, rsrqLevel), rssnrLevel);

telephony/java/android/telephony/CellSignalStrengthNr.java

+23 −7
Original line number Original line Diff line number Diff line
@@ -40,6 +40,8 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa 
     */

     */

    public static final int UNKNOWN_ASU_LEVEL = 99;

    public static final int UNKNOWN_ASU_LEVEL = 99;





    private static final boolean VDBG = false;



    private static final String TAG = "CellSignalStrengthNr";

    private static final String TAG = "CellSignalStrengthNr";





    // Lifted from Default carrier configs and max range of SSRSRP

    // Lifted from Default carrier configs and max range of SSRSRP
@@ -301,32 +303,46 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa 
        } else {

        } else {

            mParametersUseForLevel = cc.getInt(

            mParametersUseForLevel = cc.getInt(

                    CarrierConfigManager.KEY_PARAMETERS_USE_FOR_5G_NR_SIGNAL_BAR_INT, USE_SSRSRP);

                    CarrierConfigManager.KEY_PARAMETERS_USE_FOR_5G_NR_SIGNAL_BAR_INT, USE_SSRSRP);

            Rlog.i(TAG, "Using SSRSRP for Level.");

            mSsRsrpThresholds = cc.getIntArray(

            mSsRsrpThresholds = cc.getIntArray(

                    CarrierConfigManager.KEY_5G_NR_SSRSRP_THRESHOLDS_INT_ARRAY);

                    CarrierConfigManager.KEY_5G_NR_SSRSRP_THRESHOLDS_INT_ARRAY);

            Rlog.i(TAG, "Applying 5G NR SSRSRP Thresholds: " + Arrays.toString(mSsRsrpThresholds));

            if (VDBG) {

                Rlog.i(TAG, "Applying 5G NR SSRSRP Thresholds: "

                        + Arrays.toString(mSsRsrpThresholds));

            }

            mSsRsrqThresholds = cc.getIntArray(

            mSsRsrqThresholds = cc.getIntArray(

                    CarrierConfigManager.KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY);

                    CarrierConfigManager.KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY);

            Rlog.i(TAG, "Applying 5G NR SSRSRQ Thresholds: " + Arrays.toString(mSsRsrqThresholds));

            if (VDBG) {

                Rlog.i(TAG, "Applying 5G NR SSRSRQ Thresholds: "

                        + Arrays.toString(mSsRsrqThresholds));

            }

            mSsSinrThresholds = cc.getIntArray(

            mSsSinrThresholds = cc.getIntArray(

                    CarrierConfigManager.KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY);

                    CarrierConfigManager.KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY);

            Rlog.i(TAG, "Applying 5G NR SSSINR Thresholds: " + Arrays.toString(mSsSinrThresholds));

            if (VDBG) {

                Rlog.i(TAG, "Applying 5G NR SSSINR Thresholds: "

                        + Arrays.toString(mSsSinrThresholds));

            }

        }

        }

        int ssRsrpLevel = SignalStrength.INVALID;

        int ssRsrpLevel = SignalStrength.INVALID;

        int ssRsrqLevel = SignalStrength.INVALID;

        int ssRsrqLevel = SignalStrength.INVALID;

        int ssSinrLevel = SignalStrength.INVALID;

        int ssSinrLevel = SignalStrength.INVALID;

        if (isLevelForParameter(USE_SSRSRP)) {

        if (isLevelForParameter(USE_SSRSRP)) {

            ssRsrpLevel = updateLevelWithMeasure(mSsRsrp, mSsRsrpThresholds);

            ssRsrpLevel = updateLevelWithMeasure(mSsRsrp, mSsRsrpThresholds);

            if (VDBG) {

                Rlog.i(TAG, "Updated 5G NR SSRSRP Level: " + ssRsrpLevel);

                Rlog.i(TAG, "Updated 5G NR SSRSRP Level: " + ssRsrpLevel);

            }

            }

        }

        if (isLevelForParameter(USE_SSRSRQ)) {

        if (isLevelForParameter(USE_SSRSRQ)) {

            ssRsrqLevel = updateLevelWithMeasure(mSsRsrq, mSsRsrqThresholds);

            ssRsrqLevel = updateLevelWithMeasure(mSsRsrq, mSsRsrqThresholds);

            if (VDBG) {

                Rlog.i(TAG, "Updated 5G NR SSRSRQ Level: " + ssRsrqLevel);

                Rlog.i(TAG, "Updated 5G NR SSRSRQ Level: " + ssRsrqLevel);

            }

            }

        }

        if (isLevelForParameter(USE_SSSINR)) {

        if (isLevelForParameter(USE_SSSINR)) {

            ssSinrLevel = updateLevelWithMeasure(mSsSinr, mSsSinrThresholds);

            ssSinrLevel = updateLevelWithMeasure(mSsSinr, mSsSinrThresholds);

            if (VDBG) {

                Rlog.i(TAG, "Updated 5G NR SSSINR Level: " + ssSinrLevel);

                Rlog.i(TAG, "Updated 5G NR SSSINR Level: " + ssSinrLevel);

            }

            }

        }

        // Apply the smaller value among three levels of three measures.

        // Apply the smaller value among three levels of three measures.

        mLevel = Math.min(Math.min(ssRsrpLevel, ssRsrqLevel), ssSinrLevel);

        mLevel = Math.min(Math.min(ssRsrpLevel, ssRsrqLevel), ssSinrLevel);

    }

    }