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

Commit c35ff0f3 authored by Kyeongkab.Nam's avatar Kyeongkab.Nam Committed by android-build-merger
Browse files

Merge "Fix equals API bug on TvTrackInfo" am: 609ac6fe am: c6d3763f 

am: 01ffb2b2

Change-Id: I3f7e91704569bc77b00dec43ef5a2437def28180
parents 47a1a91d 01ffb2b2

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

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

        }





        TvTrackInfo obj = (TvTrackInfo) o;

        TvTrackInfo obj = (TvTrackInfo) o;

        return TextUtils.equals(mId, obj.mId)



                && mType == obj.mType

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

                && TextUtils.equals(mLanguage, obj.mLanguage)

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

                && TextUtils.equals(mDescription, obj.mDescription)

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

                && mEncrypted == obj.mEncrypted

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

                && Objects.equals(mExtra, obj.mExtra)

            return false;

                && (mType == TYPE_AUDIO

        }

                        ? mAudioChannelCount == obj.mAudioChannelCount



                        && mAudioSampleRate == obj.mAudioSampleRate

        switch (mType) {

                        : (mType == TYPE_VIDEO

            case TYPE_AUDIO:

                                ? mVideoWidth == obj.mVideoWidth

                return mAudioChannelCount == obj.mAudioChannelCount

                        && mAudioSampleRate == obj.mAudioSampleRate;



            case TYPE_VIDEO:

                return mVideoWidth == obj.mVideoWidth

                        && mVideoHeight == obj.mVideoHeight

                        && mVideoHeight == obj.mVideoHeight

                        && mVideoFrameRate == obj.mVideoFrameRate

                        && mVideoFrameRate == obj.mVideoFrameRate

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

                        && mVideoPixelAspectRatio == obj.mVideoPixelAspectRatio

                        && mVideoActiveFormatDescription == obj.mVideoActiveFormatDescription;

        }



        return true;

    }

    }





    @Override

    @Override