summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-02-28 22:13:52 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-02-28 22:13:52 +0000
commit1af4d7bf81fd2e02f2df51d9485a86d8f854d410 (patch)
treea66853a33940602224786d223bb4c7cf07f7d7fc
parent3bd28b5829f1d463b31550ebc500ec0d8874b68d (diff)
parent19c0b886822a69a1be9b857e812379643f897275 (diff)
downloadbase-1af4d7bf81fd2e02f2df51d9485a86d8f854d410.tar.gz
Merge "Remove one duplicate comparison from OutputConfiguration#equals" into main
-rw-r--r--core/java/android/hardware/camera2/params/OutputConfiguration.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java
index d6c58ac1d7fe..738b6d9ca27b 100644
--- a/core/java/android/hardware/camera2/params/OutputConfiguration.java
+++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java
@@ -1379,7 +1379,6 @@ public final class OutputConfiguration implements Parcelable {
mSurfaceType != other.mSurfaceType ||
mIsDeferredConfig != other.mIsDeferredConfig ||
mIsShared != other.mIsShared ||
- mConfiguredFormat != other.mConfiguredFormat ||
mConfiguredDataspace != other.mConfiguredDataspace ||
mConfiguredGenerationId != other.mConfiguredGenerationId ||
!Objects.equals(mPhysicalCameraId, other.mPhysicalCameraId) ||