Merge "Flipping NR signal strengths coming from HAL" am: a9298cc06f am: 6f4151d3d7

Change-Id: If9e89fe832438170c90adf60911dc451208eae16
This commit is contained in:
Automerger Merge Worker
2020-01-09 20:59:40 +00:00

View File

@@ -155,7 +155,17 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa
* @param ss signal strength from modem.
*/
public CellSignalStrengthNr(android.hardware.radio.V1_4.NrSignalStrength ss) {
this(ss.csiRsrp, ss.csiRsrq, ss.csiSinr, ss.ssRsrp, ss.ssRsrq, ss.ssSinr);
this(flip(ss.csiRsrp), flip(ss.csiRsrq), ss.csiSinr, flip(ss.ssRsrp), flip(ss.ssRsrq),
ss.ssSinr);
}
/**
* Flip sign cell strength value when taking in the value from hal
* @param val cell strength value
* @return flipped value
*/
private static int flip(int val) {
return val != CellInfo.UNAVAILABLE ? -val : val;
}
/**