commit df255a4a6b3dfbde4a8fc16279faa5d998f8eb6d
author Shuzhen Wang <shuzhenwang@google.com> Wed Jan 31 21:28:00 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 31 21:28:00 2018 +0000
tree 5d273433c891a0be6c5a5b30e183bde7d6aea4c4
parent 8289005e1000e01a3be37f1cec543bf48ca4c6d0
parent 5f7cdba8abe1845afd83c7ee5337f33d736c2ce3

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

Change-Id: Ic55969e029228542f79e870cb7b5c68602b9a084

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

diff --git a/core/java/android/hardware/camera2/params/OutputConfiguration.java b/core/java/android/hardware/camera2/params/OutputConfiguration.java
index 2b317d6..05c4dc37 100644
--- a/core/java/android/hardware/camera2/params/OutputConfiguration.java
+++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java
@@ -409,6 +409,7 @@
         this.mConfiguredSize = other.mConfiguredSize;
         this.mConfiguredGenerationId = other.mConfiguredGenerationId;
         this.mIsDeferredConfig = other.mIsDeferredConfig;
+        this.mIsShared = other.mIsShared;
     }
 
     /**
@@ -421,6 +422,7 @@
         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 @@
         mSurfaces = surfaces;
         mConfiguredSize = new Size(width, height);
         mIsDeferredConfig = isDeferred;
+        mIsShared = isShared;
         mSurfaces = surfaces;
         if (mSurfaces.size() > 0) {
             mSurfaceType = SURFACE_TYPE_UNKNOWN;