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

Commit 8eaa9532 authored by Jordan Liu's avatar Jordan Liu
Browse files

CallAttributes.equals does deep check 

Also fix PreciseCallState.equals() to not return the opposite of equals.

Bug: 123363462
Test: CallAttributesTest
Change-Id: I7a9b65a01bc32ebfe304a0434a82bfe97929421c
parent 3d834a0e

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