diff options
| author | 2023-10-25 22:02:31 +0000 | |
|---|---|---|
| committer | 2023-10-25 22:02:31 +0000 | |
| commit | 26592ad19e22568b40f6e47f82f8247ce2ea3f54 (patch) | |
| tree | c999a9e99266e6c31ac3b5a2a0c2d20ff28837b9 | |
| parent | aa4b1fc9760ff498c9dabbcb4fbc736882345092 (diff) | |
| parent | 04e59b174f08920d7b39982b8a4b13d2385928ea (diff) | |
Merge "Camera: Fix OutputConfiguration equality check" into main am: 04e59b174f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2797213
Change-Id: I0545a55b0cd84df4c77805c60c1377d42c414c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/hardware/camera2/params/OutputConfiguration.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java index 21540bf1a18b..d6c58ac1d7fe 100644 --- a/core/java/android/hardware/camera2/params/OutputConfiguration.java +++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java @@ -1403,6 +1403,7 @@ public final class OutputConfiguration implements Parcelable { 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; } |