diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2017-12-08 12:16:49 -0800 |
|---|---|---|
| committer | Shuzhen Wang <shuzhenwang@google.com> | 2017-12-19 21:23:45 -0800 |
| commit | 4304a02ac990c1af5fb8f479bdd2b04c8af4fddb (patch) | |
| tree | 41876f1718ee8265acb4b869baac5dca9c6529e2 /core/java/android | |
| parent | 2f58b03ea1207c9c4357bc4b4c0f095252db68b9 (diff) | |
OutputConfiguration: Fix missing mIsShared in parcel read
Test: Camera CTS
Bug: 69683251
Merged-In: I7ea4aa8ed4baa5a5e7d25a0073361d827ba86c13
Change-Id: I7ea4aa8ed4baa5a5e7d25a0073361d827ba86c13
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/camera2/params/OutputConfiguration.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java index 2b317d679d1c..05c4dc378890 100644 --- a/core/java/android/hardware/camera2/params/OutputConfiguration.java +++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java @@ -409,6 +409,7 @@ public final class OutputConfiguration implements Parcelable { this.mConfiguredSize = other.mConfiguredSize; this.mConfiguredGenerationId = other.mConfiguredGenerationId; this.mIsDeferredConfig = other.mIsDeferredConfig; + this.mIsShared = other.mIsShared; } /** @@ -421,6 +422,7 @@ public final class OutputConfiguration implements Parcelable { int width = source.readInt(); int height = source.readInt(); boolean isDeferred = source.readInt() == 1; + boolean isShared = source.readInt() == 1; ArrayList<Surface> surfaces = new ArrayList<Surface>(); source.readTypedList(surfaces, Surface.CREATOR); @@ -431,6 +433,7 @@ public final class OutputConfiguration implements Parcelable { mSurfaces = surfaces; mConfiguredSize = new Size(width, height); mIsDeferredConfig = isDeferred; + mIsShared = isShared; mSurfaces = surfaces; if (mSurfaces.size() > 0) { mSurfaceType = SURFACE_TYPE_UNKNOWN; |
