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

Commit 2e8d16f7 authored by nchalko's avatar nchalko Committed by Gerrit Code Review
Browse files

Merge "Fix equals and hashCode APIs on TvTrackInfo"

parents 8eed59fa b30b3850

media/java/android/media/tv/TvTrackInfo.java

+11 −3
Original line number Diff line number Diff line
@@ -352,8 +352,7 @@ public final class TvTrackInfo implements Parcelable { 
        if (!TextUtils.equals(mId, obj.mId) || mType != obj.mType

                || !TextUtils.equals(mLanguage, obj.mLanguage)

                || !TextUtils.equals(mDescription, obj.mDescription)

                || mEncrypted != obj.mEncrypted

                || !Objects.equals(mExtra, obj.mExtra)) {

                || mEncrypted != obj.mEncrypted) {

            return false;

        }
@@ -381,7 +380,16 @@ public final class TvTrackInfo implements Parcelable { 


    @Override

    public int hashCode() {

        return Objects.hashCode(mId);

        int result = Objects.hash(mId, mType, mLanguage, mDescription);



        if (mType == TYPE_AUDIO) {

            result = Objects.hash(result, mAudioChannelCount, mAudioSampleRate);

        } else if (mType == TYPE_VIDEO) {

            result = Objects.hash(result, mVideoWidth, mVideoHeight, mVideoFrameRate,

                    mVideoPixelAspectRatio);

        }



        return result;

    }



    public static final @android.annotation.NonNull Parcelable.Creator<TvTrackInfo> CREATOR =