Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev

Browse Source 
am: 6c7014dd52

Change-Id: If661321a74436c850652e728e16cf13e8de83668
This commit is contained in:
Shuzhen Wang
2019-05-03 06:37:40 -07:00
committed by android-build-merger
parent d53335a334 6c7014dd52
commit 4f4fa12784
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/camera2/params/OutputConfiguration.java
View File

@@ -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());