summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSungsoo Lim <sungsoo@google.com>2014-08-13 11:13:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-12 23:14:42 +0000
commitdd0b7d083fd7a176c8cba151469d34ec69803a70 (patch)
treed235de384708f927c41916cb07dac23028459f06
parent20200849d1dd6ac5e52b3d18ced2d9becb5ff229 (diff)
parenta9a29a29e55380ebd30175a75b285b16201002b6 (diff)
downloadframeworks_base-dd0b7d083fd7a176c8cba151469d34ec69803a70.zip
frameworks_base-dd0b7d083fd7a176c8cba151469d34ec69803a70.tar.gz
frameworks_base-dd0b7d083fd7a176c8cba151469d34ec69803a70.tar.bz2
Merge "Fix hashCode of TvContentRating" into lmp-dev
-rw-r--r--media/java/android/media/tv/TvContentRating.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/tv/TvContentRating.java b/media/java/android/media/tv/TvContentRating.java
index 25252ed..3e5ecef 100644
--- a/media/java/android/media/tv/TvContentRating.java
+++ b/media/java/android/media/tv/TvContentRating.java
@@ -1480,7 +1480,7 @@ public final class TvContentRating {
Arrays.sort(subRatings);
mSubRatings = subRatings;
}
- mHashCode = Objects.hash(mDomain, mRating, mSubRatings);
+ mHashCode = 31 * Objects.hash(mDomain, mRating) + Arrays.hashCode(mSubRatings);
}
/**