Config of LTE signal strength default value remove SNR

parameters_used_for_lte_signal_bar_int default value set
"RSRP = 1 << 0"

Bug: 146317112
Test: 1. atest SignalStrengthTest.java
2. atest cts/tests/tests/telephony/current/src/android/telephony/cts/SignalStrengthTest.java
Change-Id: I75d5719a743ce815990a17c640bfb15e47d7802a
Merged-In: Ifd8ba60f112832aac975974e5f29290ac48c18b2
This commit is contained in:
SongFerngWang
2020-02-04 21:29:47 +08:00
parent 6bf0c6185d
commit e0ab4318cc
2 changed files with 4 additions and 4 deletions

View File

@@ -2321,7 +2321,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
@@ -3891,7 +3891,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);
}
/**

View File

@@ -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;