commit 0819c75680c81a4e9c8a1ec518ac62cceccf3f56
author Eino-Ville Talvala <etalvala@google.com> Wed Jun 17 11:34:41 2015 -0700
committer Eino-Ville Talvala <etalvala@google.com> Mon Jun 22 14:21:22 2015 -0700
tree 687bb951b8a07f2c279ff4c2c633fb087c5465f9
parent a77ef4b8b4c11a9fdfdca030462b7b055bf533bc

Camera2: Remove HIGH_RESOLUTION level and modify FULL requirements

- Reword requirements for FULL level
- Remove HIGH_RESOLUTION level
- Add StreamConfigurationMap#getHighResolutionOutputSizes
- Clean up StreamConfigurationMap implementation
- Add 5-argument HashCodeHelper

Bug: 20945581
Change-Id: I75ad4b23e902192c96ed501e10c7d55fc0ad72a6

core/java/android/hardware/camera2/CaptureRequest.java

diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java
index 9fa6687..e405ba6 100644
--- a/core/java/android/hardware/camera2/CaptureRequest.java
+++ b/core/java/android/hardware/camera2/CaptureRequest.java
@@ -398,7 +398,7 @@
 
     @Override
     public int hashCode() {
-        return HashCodeHelpers.hashCode(mSettings, mSurfaceSet, mUserTag);
+        return HashCodeHelpers.hashCodeGeneric(mSettings, mSurfaceSet, mUserTag);
     }
 
     public static final Parcelable.Creator<CaptureRequest> CREATOR =