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

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

Merge "Update hashCode in CellSignalStrength classes" 

am: 59fec059

Change-Id: I1c00ea5351b86a4554b8276b01d9439e0a362d9a
parents e01fe741 59fec059

telephony/java/android/telephony/CellSignalStrengthCdma.java

+3 −3
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.telephony.Rlog;



import java.util.Objects;



/**

 * Signal strength related information.

 */
@@ -293,9 +295,7 @@ public final class CellSignalStrengthCdma extends CellSignalStrength implements 


    @Override

    public int hashCode() {

        int primeNum = 31;

        return ((mCdmaDbm * primeNum) + (mCdmaEcio * primeNum)

                + (mEvdoDbm * primeNum) + (mEvdoEcio * primeNum) + (mEvdoSnr * primeNum));

        return Objects.hash(mCdmaDbm, mCdmaEcio, mEvdoDbm, mEvdoEcio, mEvdoSnr);

    }



    @Override

telephony/java/android/telephony/CellSignalStrengthGsm.java

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.telephony.Rlog;



import java.util.Objects;



/**

 * GSM signal strength related information.

 */
@@ -185,8 +187,7 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P 


    @Override

    public int hashCode() {

        int primeNum = 31;

        return (mSignalStrength * primeNum) + (mBitErrorRate * primeNum);

        return Objects.hash(mSignalStrength, mBitErrorRate, mTimingAdvance);

    }



    @Override

telephony/java/android/telephony/CellSignalStrengthLte.java

+3 −4
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.telephony.Rlog;



import java.util.Objects;



/**

 * LTE signal strength related information.

 */
@@ -231,10 +233,7 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P 


    @Override

    public int hashCode() {

        int primeNum = 31;

        return (mSignalStrength * primeNum) + (mRsrp * primeNum)

                + (mRsrq * primeNum) + (mRssnr * primeNum) + (mCqi * primeNum)

                + (mTimingAdvance * primeNum);

        return Objects.hash(mSignalStrength, mRsrp, mRsrq, mRssnr, mCqi, mTimingAdvance);

    }



    @Override

telephony/java/android/telephony/CellSignalStrengthWcdma.java

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.telephony.Rlog;



import java.util.Objects;



/**

 * Wcdma signal strength related information.

 */
@@ -156,8 +158,7 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements 


    @Override

    public int hashCode() {

        int primeNum = 31;

        return (mSignalStrength * primeNum) + (mBitErrorRate * primeNum);

        return Objects.hash(mSignalStrength, mBitErrorRate);

    }



    @Override