From 9c98c4bb109b833c88b138b4f0c39f6d733df9e4 Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 8 Mar 2016 03:42:19 -0800 Subject: [PATCH] Make Track[Group|GroupArray|Selection] consistent. - I don't think the length is useful in hashCode; if the length is different then Arrays.hashCode should account for that. - "this." just for consistency across these classes. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116641142 --- .../main/java/com/google/android/exoplayer/TrackGroup.java | 3 +-- .../java/com/google/android/exoplayer/TrackGroupArray.java | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/TrackGroup.java b/library/src/main/java/com/google/android/exoplayer/TrackGroup.java index fb9d7f5d49..9d9612c35b 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackGroup.java +++ b/library/src/main/java/com/google/android/exoplayer/TrackGroup.java @@ -58,7 +58,7 @@ public final class TrackGroup { Assertions.checkState(formats.length > 0); this.adaptive = adaptive; this.formats = formats; - length = formats.length; + this.length = formats.length; } /** @@ -77,7 +77,6 @@ public final class TrackGroup { int result = 17; result = 31 * result + (adaptive ? 1231 : 1237); result = 31 * result + Arrays.hashCode(formats); - result = 31 * result + length; hashCode = result; } return hashCode; diff --git a/library/src/main/java/com/google/android/exoplayer/TrackGroupArray.java b/library/src/main/java/com/google/android/exoplayer/TrackGroupArray.java index 51f387cd71..d154d9b55e 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackGroupArray.java +++ b/library/src/main/java/com/google/android/exoplayer/TrackGroupArray.java @@ -53,10 +53,7 @@ public final class TrackGroupArray { @Override public int hashCode() { if (hashCode == 0) { - int result = 17; - result = 31 * result + Arrays.hashCode(trackGroups); - result = 31 * result + length; - hashCode = result; + hashCode = Arrays.hashCode(trackGroups); } return hashCode; }