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

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

Merge "CallAttributes.equals does deep check" 

am: 8f7a989d

Change-Id: Icf149a42d0138c08b3a6b12bb00f9eba7d7e6a4f
parents 93bae4c4 8f7a989d

telephony/java/android/telephony/CallAttributes.java

+2 −2
Original line number Diff line number Diff line
@@ -117,9 +117,9 @@ public class CallAttributes implements Parcelable { 


        CallAttributes s = (CallAttributes) o;



        return (mPreciseCallState == s.mPreciseCallState

        return (Objects.equals(mPreciseCallState, s.mPreciseCallState)

                && mNetworkType == s.mNetworkType

                && mCallQuality == s.mCallQuality);

                && Objects.equals(mCallQuality, s.mCallQuality));

    }



    /**

telephony/java/android/telephony/PreciseCallState.java

+5 −5
Original line number Diff line number Diff line
@@ -287,11 +287,11 @@ public final class PreciseCallState implements Parcelable { 
            return false;

        }

        PreciseCallState other = (PreciseCallState) obj;

        return (mRingingCallState != other.mRingingCallState &&

            mForegroundCallState != other.mForegroundCallState &&

            mBackgroundCallState != other.mBackgroundCallState &&

            mDisconnectCause != other.mDisconnectCause &&

            mPreciseDisconnectCause != other.mPreciseDisconnectCause);

        return (mRingingCallState == other.mRingingCallState

                && mForegroundCallState == other.mForegroundCallState

                && mBackgroundCallState == other.mBackgroundCallState

                && mDisconnectCause == other.mDisconnectCause

                && mPreciseDisconnectCause == other.mPreciseDisconnectCause);

    }



    @Override