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

Commit 4b2e60bc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove one duplicate comparison from OutputConfiguration#equals" into... 

Merge "Remove one duplicate comparison from OutputConfiguration#equals" into main am: 1af4d7bf am: ca0cbb96

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



Change-Id: I1aa3abe275404a990c5499184a0faa40757ee965
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e27d800a ca0cbb96

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

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