Merge "Implement CodecProfileLevel.{equals|hashCode}" into pi-dev

am: 89a2b6c560

Change-Id: I95389e92c7d0b9cae098997e6c6e7b9aa27a149e

media/java/android/media/MediaCodecInfo.java

@@ -3078,6 +3078,23 @@ public final class MediaCodecInfo {
          * {@link VideoCapabilities} to determine the codec capabilities.
          */
         public int level;
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == null) {
+                return false;
+            }
+            if (obj instanceof CodecProfileLevel) {
+                CodecProfileLevel other = (CodecProfileLevel)obj;
+                return other.profile == profile && other.level == level;
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return Long.hashCode(((long)profile << Integer.SIZE) | level);
+        }
     };
 
     /**