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

Commit 37be9f90 authored by Kyeongkab.Nam's avatar Kyeongkab.Nam
Browse files

Fix equals API bug on TvTrackInfo 

Member variable of mVideoActiveFormatDescription is not compared
on equals API. The variable should be compared on the equals API.

Test: build
Change-Id: Ib8fde63afb0504140f34ebd695f4524db9c74748
parent b6ae55b1

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

+24 −16
Original line number Diff line number Diff line
@@ -285,20 +285,28 @@ public final class TvTrackInfo implements Parcelable { 
        }



        TvTrackInfo obj = (TvTrackInfo) o;

        return 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)

                && (mType == TYPE_AUDIO

                        ? mAudioChannelCount == obj.mAudioChannelCount

                        && mAudioSampleRate == obj.mAudioSampleRate

                        : (mType == TYPE_VIDEO

                                ? mVideoWidth == obj.mVideoWidth



        if (!TextUtils.equals(mId, obj.mId) || mType != obj.mType

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

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

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

            return false;

        }



        switch (mType) {

            case TYPE_AUDIO:

                return mAudioChannelCount == obj.mAudioChannelCount

                        && mAudioSampleRate == obj.mAudioSampleRate;



            case TYPE_VIDEO:

                return mVideoWidth == obj.mVideoWidth

                        && mVideoHeight == obj.mVideoHeight

                        && mVideoFrameRate == obj.mVideoFrameRate

                                && mVideoPixelAspectRatio == obj.mVideoPixelAspectRatio : true));

                        && mVideoPixelAspectRatio == obj.mVideoPixelAspectRatio

                        && mVideoActiveFormatDescription == obj.mVideoActiveFormatDescription;

        }



        return true;

    }



    @Override