Merge "Update values for NR signal strength" am: 8f2cd8d7b3 am: de83608fa3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160160

Change-Id: Id99341bb34555819f94c2c6b5c072b36f43c4c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-21 06:03:50 +00:00
committed by Automerger Merge Worker

View File

@@ -49,7 +49,7 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
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
// Boundaries: [-140 dB, -44 dB] // Boundaries: [-156 dB, -31 dB]
private int[] mSsRsrpThresholds = new int[] { private int[] mSsRsrpThresholds = new int[] {
-110, /* SIGNAL_STRENGTH_POOR */ -110, /* SIGNAL_STRENGTH_POOR */
-90, /* SIGNAL_STRENGTH_MODERATE */ -90, /* SIGNAL_STRENGTH_MODERATE */
@@ -173,14 +173,14 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
*/ */
public CellSignalStrengthNr(int csiRsrp, int csiRsrq, int csiSinr, int csiCqiTableIndex, public CellSignalStrengthNr(int csiRsrp, int csiRsrq, int csiSinr, int csiCqiTableIndex,
List<Byte> csiCqiReport, int ssRsrp, int ssRsrq, int ssSinr) { List<Byte> csiCqiReport, int ssRsrp, int ssRsrq, int ssSinr) {
mCsiRsrp = inRangeOrUnavailable(csiRsrp, -140, -44); mCsiRsrp = inRangeOrUnavailable(csiRsrp, -156, -31);
mCsiRsrq = inRangeOrUnavailable(csiRsrq, -20, -3); mCsiRsrq = inRangeOrUnavailable(csiRsrq, -20, -3);
mCsiSinr = inRangeOrUnavailable(csiSinr, -23, 23); mCsiSinr = inRangeOrUnavailable(csiSinr, -23, 23);
mCsiCqiTableIndex = inRangeOrUnavailable(csiCqiTableIndex, 1, 3); mCsiCqiTableIndex = inRangeOrUnavailable(csiCqiTableIndex, 1, 3);
mCsiCqiReport = csiCqiReport.stream() mCsiCqiReport = csiCqiReport.stream()
.map(cqi -> new Integer(inRangeOrUnavailable(Byte.toUnsignedInt(cqi), 0, 15))) .map(cqi -> inRangeOrUnavailable(Byte.toUnsignedInt(cqi), 0, 15))
.collect(Collectors.toList()); .collect(Collectors.toList());
mSsRsrp = inRangeOrUnavailable(ssRsrp, -140, -44); mSsRsrp = inRangeOrUnavailable(ssRsrp, -156, -31);
mSsRsrq = inRangeOrUnavailable(ssRsrq, -43, 20); mSsRsrq = inRangeOrUnavailable(ssRsrq, -43, 20);
mSsSinr = inRangeOrUnavailable(ssSinr, -23, 40); mSsSinr = inRangeOrUnavailable(ssSinr, -23, 40);
updateLevel(null, null); updateLevel(null, null);
@@ -212,8 +212,8 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
} }
/** /**
* Reference: 3GPP TS 38.215. * Reference: 3GPP TS 38.133 10.1.6.1.
* Range: -140 dBm to -44 dBm. * Range: -156 dBm to -31 dBm.
* @return SS reference signal received power, {@link CellInfo#UNAVAILABLE} means unreported * @return SS reference signal received power, {@link CellInfo#UNAVAILABLE} means unreported
* value. * value.
*/ */
@@ -242,8 +242,8 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
} }
/** /**
* Reference: 3GPP TS 38.215. * Reference: 3GPP TS 38.133 10.1.6.1.
* Range: -140 dBm to -44 dBm. * Range: -156 dBm to -31 dBm.
* @return CSI reference signal received power, {@link CellInfo#UNAVAILABLE} means unreported * @return CSI reference signal received power, {@link CellInfo#UNAVAILABLE} means unreported
* value. * value.
*/ */