Merge "Fix equals API bug on TvTrackInfo" am: 609ac6fe3a am: c6d3763fd7 am: 01ffb2b2dd (f571b16b) · Commits · e / os / android_frameworks_base

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