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

Commit 07824c6e authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Config of LTE signal strength default value remove SNR"

parents d1c394c5 680c986f

telephony/java/android/telephony/CarrierConfigManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2377,7 +2377,7 @@ public class CarrierConfigManager { 
     *  {@link CellSignalStrengthLte#USE_RSRQ}, {@link CellSignalStrengthLte#USE_RSSNR}.

     *

     * For example, if both RSRP and RSRQ are used, the value of key is 3 (1 << 0 | 1 << 1).

     * If the key is invalid or not configured, a default value (RSRP | RSSNR = 1 << 0 | 1 << 2)

     * If the key is invalid or not configured, a default value (RSRP = 1 << 0)

     * will apply.

     *

     * @hide
@@ -4334,7 +4334,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);

        sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000);

        sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT,

                CellSignalStrengthLte.USE_RSRP | CellSignalStrengthLte.USE_RSSNR);

                CellSignalStrengthLte.USE_RSRP);

        // Default wifi configurations.

        sDefaults.putAll(Wifi.getDefaults());

        sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false);

telephony/java/android/telephony/CellSignalStrengthLte.java

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P 
        mCqi = CellInfo.UNAVAILABLE;

        mTimingAdvance = CellInfo.UNAVAILABLE;

        mLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;

        mParametersUseForLevel = USE_RSRP | USE_RSSNR;

        mParametersUseForLevel = USE_RSRP;

    }



    /** {@inheritDoc} */
@@ -236,7 +236,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P 
        int[] rsrpThresholds, rsrqThresholds, rssnrThresholds;

        boolean rsrpOnly;

        if (cc == null) {

            mParametersUseForLevel = USE_RSRP | USE_RSSNR;

            mParametersUseForLevel = USE_RSRP;

            rsrpThresholds = sRsrpThresholds;

            rsrqThresholds = sRsrqThresholds;

            rssnrThresholds = sRssnrThresholds;