Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4068e8e6 authored by nharold's avatar nharold Committed by Gerrit Code Review
Browse files

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

parents 5b2fe53a 31135514
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ public class SignalStrength implements Parcelable {
    private int mLteRsrq;
    private int mLteRsrq;
    private int mLteRssnr;
    private int mLteRssnr;
    private int mLteCqi;
    private int mLteCqi;
    private int mTdScdmaRscp;
    private int mTdScdmaRscp; // Valid values are -24...-120dBm or INVALID if unknown
    private int mWcdmaSignalStrength;
    private int mWcdmaSignalStrength;
    private int mWcdmaRscpAsu;  // the WCDMA RSCP in ASU as reported from the HAL
    private int mWcdmaRscpAsu;  // the WCDMA RSCP in ASU as reported from the HAL
    private int mWcdmaRscp;     // the WCDMA RSCP in dBm
    private int mWcdmaRscp;     // the WCDMA RSCP in dBm
@@ -396,8 +396,8 @@ public class SignalStrength implements Parcelable {
        mLteRssnr = ((mLteRssnr >= -200) && (mLteRssnr <= 300)) ? mLteRssnr
        mLteRssnr = ((mLteRssnr >= -200) && (mLteRssnr <= 300)) ? mLteRssnr
                : SignalStrength.INVALID;
                : SignalStrength.INVALID;


        mTdScdmaRscp = ((mTdScdmaRscp >= 25) && (mTdScdmaRscp <= 120))
        mTdScdmaRscp = ((mTdScdmaRscp >= 0) && (mTdScdmaRscp <= 96))
                ? -mTdScdmaRscp : SignalStrength.INVALID;
                ? (mTdScdmaRscp - 120) : SignalStrength.INVALID;
        // Cqi no change
        // Cqi no change
        if (DBG) log("Signal after validate=" + this);
        if (DBG) log("Signal after validate=" + this);
    }
    }