commit 04e59b174f08920d7b39982b8a4b13d2385928ea
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 25 21:33:38 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 25 21:33:38 2023 +0000
tree ac897f00fc200702c37fb01a0e49e2f889d03f6a
parent c410ea7aabbfc5578bc62c452ead4122919a719f
parent 1ab5f01c94be4a9a8031f60ee86584640d566907

Merge "Camera: Fix OutputConfiguration equality check" into main

core/java/android/hardware/camera2/params/OutputConfiguration.java

diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java
index 21540bf..d6c58ac 100644
--- a/core/java/android/hardware/camera2/params/OutputConfiguration.java
+++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java
@@ -1403,6 +1403,7 @@
                 if (mSurfaces.get(i) != other.mSurfaces.get(i))
                     return false;
             }
+            if (!mIsDeferredConfig && mSurfaces.size() != other.mSurfaces.size()) return false;
             if (mDynamicRangeProfile != other.mDynamicRangeProfile) {
                 return false;
             }