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

Commit 004629af authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "CallAttributes.equals does deep check" am: 8f7a989d am: 77013af5 am: 5e37fc2f"

parents 5fe4c6b1 6a9358a7

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