Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8de362e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix OutputConfiguration equality check" into main am:... 

Merge "Camera: Fix OutputConfiguration equality check" into main am: 04e59b17 am: 523dcae7 am: b5670c0f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2797213



Change-Id: I1eb6464cece62c0e5d4e4446a77e11eb6b4c7b14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ff4cc3c b5670c0f

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

+1 −0
Original line number Diff line number Diff line
@@ -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;

            }