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

Merge "Fix equals and hashCode APIs on TvTrackInfo" am: 2e8d16f714 am: 7e6df33644

Browse Source 
Change-Id: I5ce9341c0c09ebd017fe718fb54d4824aaa3923b
This commit is contained in:
Automerger Merge Worker
2020-01-22 23:50:34 +00:00
parent 950faa1252 7e6df33644
commit 08c064c6c3
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 =