Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix equals API bug on TvTrackInfo" am: 609ac6fe3a am: c6d3763fd7

Browse Source 
am: 01ffb2b2dd

Change-Id: I3f7e91704569bc77b00dec43ef5a2437def28180
This commit is contained in:
Kyeongkab.Nam
2019-06-27 09:18:16 -07:00
committed by android-build-merger
parent 47a1a91dfa 01ffb2b2dd
commit c35ff0f362
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
media/java/android/media/tv/TvTrackInfo.java
View File

@@ -277,28 +277,36 @@ public final class TvTrackInfo implements Parcelable {
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
return true;
}
if (!(o instanceof TvTrackInfo)) {
return false;
return false;
}
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
&& mVideoHeight == obj.mVideoHeight
&& mVideoFrameRate == obj.mVideoFrameRate
&& mVideoPixelAspectRatio == obj.mVideoPixelAspectRatio : true));
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
&& mVideoActiveFormatDescription == obj.mVideoActiveFormatDescription;
}
return true;
}
@Override