Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Config of LTE signal strength default value remove SNR" am: b9e141bc55

Browse Source 
Change-Id: I6dfeab49fd99678816d49c52e910cb1eaff1494d
This commit is contained in:
SongFerng Wang
2020-02-17 05:44:47 +00:00
parent 2c7a224e1b b9e141bc55
commit c443e7ba90
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -2330,7 +2330,7 @@ public class CarrierConfigManager {
* {@link CellSignalStrengthLte#USE_RSRQ}, {@link CellSignalStrengthLte#USE_RSSNR}. * {@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). * 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. * will apply.
* *
* @hide * @hide
@@ -3901,7 +3901,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false); sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);
sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000); sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000);
sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT, sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT,
CellSignalStrengthLte.USE_RSRP | CellSignalStrengthLte.USE_RSSNR); CellSignalStrengthLte.USE_RSRP);
} }
/** /**

4
telephony/java/android/telephony/CellSignalStrengthLte.java
View File

@@ -181,7 +181,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
mCqi = CellInfo.UNAVAILABLE; mCqi = CellInfo.UNAVAILABLE;
mTimingAdvance = CellInfo.UNAVAILABLE; mTimingAdvance = CellInfo.UNAVAILABLE;
mLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN; mLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
mParametersUseForLevel = USE_RSRP | USE_RSSNR; mParametersUseForLevel = USE_RSRP;
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@@ -236,7 +236,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P
int[] rsrpThresholds, rsrqThresholds, rssnrThresholds; int[] rsrpThresholds, rsrqThresholds, rssnrThresholds;
boolean rsrpOnly; boolean rsrpOnly;
if (cc == null) { if (cc == null) {
mParametersUseForLevel = USE_RSRP | USE_RSSNR; mParametersUseForLevel = USE_RSRP;
rsrpThresholds = sRsrpThresholds; rsrpThresholds = sRsrpThresholds;
rsrqThresholds = sRsrqThresholds; rsrqThresholds = sRsrqThresholds;
rssnrThresholds = sRssnrThresholds; rssnrThresholds = sRssnrThresholds;