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

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

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

Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev am: 5f7cdba8 am: df255a4a
am: 152acb51

Change-Id: I744ced5fe3d6ad25c4aaf8deb438286ba5803480
parents 05bd4a66 152acb51

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

+3 −0
Original line number Diff line number Diff line
@@ -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;