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

Commit 132c80df authored by nharold's avatar nharold Committed by android-build-merger
Browse files

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

am: 4068e8e6

Change-Id: Iac579d6eb416b6aca260b0f4e79f311b059d8466
parents 7c7d28cd 4068e8e6

telephony/java/android/telephony/SignalStrength.java

+3 −3
Original line number Diff line number Diff line
@@ -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);

    }