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

Commit f66deb6c authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Initialize mWcdmaRscpAsu and fix invalid value for asu" am: 36886b6f 

am: 0c345309

Change-Id: Ieed1d385da08c5e06ea2cafe076d84522af5cf8d
parents feb5f270 0c345309

telephony/java/android/telephony/SignalStrength.java

+2 −1
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ public class SignalStrength implements Parcelable { 
        mTdScdmaRscp = INVALID;

        mWcdmaSignalStrength = 99;

        mWcdmaRscp = INVALID;

        mWcdmaRscpAsu = 255;

        mLteRsrpBoost = 0;

        mIsGsm = gsmFlag;

        mUseOnlyRsrpForLteLevel = false;
@@ -383,7 +384,7 @@ public class SignalStrength implements Parcelable { 
        // but are reported in ASU which is 0 through 96, so we do the conversion here

        mWcdmaRscpAsu =

                ((mWcdmaRscpAsu - 120 >= MIN_WCDMA_RSCP) && (mWcdmaRscpAsu - 120 <= MAX_WCDMA_RSCP))

                ? mWcdmaRscpAsu : INVALID;

                ? mWcdmaRscpAsu : 255;

        mWcdmaRscp = ((mWcdmaRscp >= MIN_WCDMA_RSCP) && (mWcdmaRscp <= MAX_WCDMA_RSCP))

                ? mWcdmaRscp : INVALID;