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

Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-31 21:11:32 +00:00
committed by Android (Google) Code Review
parent e15cb623db 4304a02ac9
commit 5f7cdba8ab
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,6 +409,7 @@ public final class OutputConfiguration implements Parcelable {
this.mConfiguredSize = other.mConfiguredSize; this.mConfiguredSize = other.mConfiguredSize;
this.mConfiguredGenerationId = other.mConfiguredGenerationId; this.mConfiguredGenerationId = other.mConfiguredGenerationId;
this.mIsDeferredConfig = other.mIsDeferredConfig; this.mIsDeferredConfig = other.mIsDeferredConfig;
this.mIsShared = other.mIsShared;
} }
/** /**
@@ -421,6 +422,7 @@ public final class OutputConfiguration implements Parcelable {
int width = source.readInt(); int width = source.readInt();
int height = source.readInt(); int height = source.readInt();
boolean isDeferred = source.readInt() == 1; boolean isDeferred = source.readInt() == 1;
boolean isShared = source.readInt() == 1;
ArrayList<Surface> surfaces = new ArrayList<Surface>(); ArrayList<Surface> surfaces = new ArrayList<Surface>();
source.readTypedList(surfaces, Surface.CREATOR); source.readTypedList(surfaces, Surface.CREATOR);
@@ -431,6 +433,7 @@ public final class OutputConfiguration implements Parcelable {
mSurfaces = surfaces; mSurfaces = surfaces;
mConfiguredSize = new Size(width, height); mConfiguredSize = new Size(width, height);
mIsDeferredConfig = isDeferred; mIsDeferredConfig = isDeferred;
mIsShared = isShared;
mSurfaces = surfaces; mSurfaces = surfaces;
if (mSurfaces.size() > 0) { if (mSurfaces.size() > 0) {
mSurfaceType = SURFACE_TYPE_UNKNOWN; mSurfaceType = SURFACE_TYPE_UNKNOWN;