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

Commit 0d54a8bd authored by Shuzhen Wang's avatar Shuzhen Wang Committed by android-build-merger
Browse files

Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison"... 

Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev am: 6c7014dd
am: 4f4fa127

Change-Id: I529ca49c7d6c48162679b4df64c05646f33b17da
parents 8a4094e7 4f4fa127

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

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import static com.android.internal.util.Preconditions.*; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Objects;



/**

 * A class for describing camera output, which contains a {@link Surface} and its specific
@@ -692,7 +693,8 @@ public final class OutputConfiguration implements Parcelable { 
                    mIsShared != other.mIsShared ||

                    mConfiguredFormat != other.mConfiguredFormat ||

                    mConfiguredDataspace != other.mConfiguredDataspace ||

                    mConfiguredGenerationId != other.mConfiguredGenerationId)

                    mConfiguredGenerationId != other.mConfiguredGenerationId ||

                    !Objects.equals(mPhysicalCameraId, other.mPhysicalCameraId))

                return false;



            int minLen = Math.min(mSurfaces.size(), other.mSurfaces.size());