Merge "Update SignalStrength to use ASU for TD-SDCMA"

This commit is contained in:
nharold
2018-03-07 02:05:34 +00:00
committed by Gerrit Code Review

View File

@@ -82,7 +82,7 @@ public class SignalStrength implements Parcelable {
private int mLteRsrq;
private int mLteRssnr;
private int mLteCqi;
private int mTdScdmaRscp;
private int mTdScdmaRscp; // Valid values are -24...-120dBm or INVALID if unknown
private int mWcdmaSignalStrength;
private int mWcdmaRscpAsu; // the WCDMA RSCP in ASU as reported from the HAL
private int mWcdmaRscp; // the WCDMA RSCP in dBm
@@ -396,8 +396,8 @@ public class SignalStrength implements Parcelable {
mLteRssnr = ((mLteRssnr >= -200) && (mLteRssnr <= 300)) ? mLteRssnr
: SignalStrength.INVALID;
mTdScdmaRscp = ((mTdScdmaRscp >= 25) && (mTdScdmaRscp <= 120))
? -mTdScdmaRscp : SignalStrength.INVALID;
mTdScdmaRscp = ((mTdScdmaRscp >= 0) && (mTdScdmaRscp <= 96))
? (mTdScdmaRscp - 120) : SignalStrength.INVALID;
// Cqi no change
if (DBG) log("Signal after validate=" + this);
}