Camera: add equals/hashCode to OutputConfiguration

Bug: 20057354
Change-Id: Ib9c2e26ac4c52c47ccab86a7f25363b164d36eb6

1 files changed, 30 insertions, 0 deletions

diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java
index 0a4ed39..7aa9787 100644
--- a/core/java/android/hardware/camera2/params/OutputConfiguration.java
+++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java
@@ -18,6 +18,7 @@
 package android.hardware.camera2.params;
 
 import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.utils.HashCodeHelpers;
 import android.util.Log;
 import android.view.Surface;
 import android.os.Parcel;
@@ -159,6 +160,35 @@ public final class OutputConfiguration implements Parcelable {
         mSurface.writeToParcel(dest, flags);
     }
 
+    /**
+     * Check if this {@link OutputConfiguration} is equal to another {@link OutputConfiguration}.
+     *
+     * <p>Two output configurations are only equal if and only if the underlying surface and
+     * all other configuration parameters are equal. </p>
+     *
+     * @return {@code true} if the objects were equal, {@code false} otherwise
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        } else if (this == obj) {
+            return true;
+        } else if (obj instanceof OutputConfiguration) {
+            final OutputConfiguration other = (OutputConfiguration) obj;
+            return (mSurface == other.mSurface && mRotation == other.mRotation);
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeHelpers.hashCode(mSurface.hashCode(), mRotation);
+    }
+
     private static final String TAG = "OutputConfiguration";
     private final Surface mSurface;
     private final int mRotation;