Merge "Change the range of SS-RSRQ per 3GPP TS 38.133 section 10" into rvc-d1-dev

This commit is contained in:
Shuo Qian
2020-07-11 00:06:35 +00:00
committed by Android (Google) Code Review
2 changed files with 16 additions and 16 deletions

View File

@@ -2512,15 +2512,15 @@ public class CarrierConfigManager {
/** /**
* List of 4 customized 5G SS reference signal received quality (SSRSRQ) thresholds. * List of 4 customized 5G SS reference signal received quality (SSRSRQ) thresholds.
* <p> * <p>
* Reference: 3GPP TS 38.215 * Reference: 3GPP TS 38.215; 3GPP TS 38.133 section 10
* <p> * <p>
* 4 threshold integers must be within the boundaries [-20 dB, -3 dB], and the levels are: * 4 threshold integers must be within the boundaries [-43 dB, 20 dB], and the levels are:
* <UL> * <UL>
* <LI>"NONE: [-20, threshold1]"</LI> * <LI>"NONE: [-43, threshold1]"</LI>
* <LI>"POOR: (threshold1, threshold2]"</LI> * <LI>"POOR: (threshold1, threshold2]"</LI>
* <LI>"MODERATE: (threshold2, threshold3]"</LI> * <LI>"MODERATE: (threshold2, threshold3]"</LI>
* <LI>"GOOD: (threshold3, threshold4]"</LI> * <LI>"GOOD: (threshold3, threshold4]"</LI>
* <LI>"EXCELLENT: (threshold4, -3]"</LI> * <LI>"EXCELLENT: (threshold4, 20]"</LI>
* </UL> * </UL>
* <p> * <p>
* This key is considered invalid if the format is violated. If the key is invalid or * This key is considered invalid if the format is violated. If the key is invalid or
@@ -4246,12 +4246,12 @@ public class CarrierConfigManager {
-65, /* SIGNAL_STRENGTH_GREAT */ -65, /* SIGNAL_STRENGTH_GREAT */
}); });
sDefaults.putIntArray(KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY, sDefaults.putIntArray(KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY,
// Boundaries: [-20 dB, -3 dB] // Boundaries: [-43 dB, 20 dB]
new int[] { new int[] {
-16, /* SIGNAL_STRENGTH_POOR */ -31, /* SIGNAL_STRENGTH_POOR */
-12, /* SIGNAL_STRENGTH_MODERATE */ -19, /* SIGNAL_STRENGTH_MODERATE */
-9, /* SIGNAL_STRENGTH_GOOD */ -7, /* SIGNAL_STRENGTH_GOOD */
-6 /* SIGNAL_STRENGTH_GREAT */ 6 /* SIGNAL_STRENGTH_GREAT */
}); });
sDefaults.putIntArray(KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY, sDefaults.putIntArray(KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY,
// Boundaries: [-23 dB, 40 dB] // Boundaries: [-23 dB, 40 dB]

View File

@@ -54,12 +54,12 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
}; };
// Lifted from Default carrier configs and max range of SSRSRQ // Lifted from Default carrier configs and max range of SSRSRQ
// Boundaries: [-20 dB, -3 dB] // Boundaries: [-43 dB, 20 dB]
private int[] mSsRsrqThresholds = new int[] { private int[] mSsRsrqThresholds = new int[] {
-16, /* SIGNAL_STRENGTH_POOR */ -31, /* SIGNAL_STRENGTH_POOR */
-12, /* SIGNAL_STRENGTH_MODERATE */ -19, /* SIGNAL_STRENGTH_MODERATE */
-9, /* SIGNAL_STRENGTH_GOOD */ -7, /* SIGNAL_STRENGTH_GOOD */
-6 /* SIGNAL_STRENGTH_GREAT */ 6 /* SIGNAL_STRENGTH_GREAT */
}; };
// Lifted from Default carrier configs and max range of SSSINR // Lifted from Default carrier configs and max range of SSSINR
@@ -183,8 +183,8 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
} }
/** /**
* Reference: 3GPP TS 38.215. * Reference: 3GPP TS 38.215; 3GPP TS 38.133 section 10
* Range: -20 dB to -3 dB. * Range: -43 dB to 20 dB.
* @return SS reference signal received quality, {@link CellInfo#UNAVAILABLE} means unreported * @return SS reference signal received quality, {@link CellInfo#UNAVAILABLE} means unreported
* value. * value.
*/ */