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

Commit 36cff7cc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed" into sc-qpr1-dev

parents c226dcf6 a7c45f4f

libs/gui/SurfaceControl.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ SurfaceControl::SurfaceControl(const sp<SurfaceControl>& other) { 
    mLayerId = other->mLayerId;

    mLayerId = other->mLayerId;

    mWidth = other->mWidth;

    mWidth = other->mWidth;

    mHeight = other->mHeight;

    mHeight = other->mHeight;

    mFormat = other->mFormat;

    mCreateFlags = other->mCreateFlags;

    mCreateFlags = other->mCreateFlags;

}

}

libs/gui/include/gui/SurfaceControl.h

+7 −6
Original line number Original line Diff line number Diff line
@@ -118,12 +118,13 @@ private: 
    mutable sp<Surface>         mSurfaceData;

    mutable sp<Surface>         mSurfaceData;

    mutable sp<BLASTBufferQueue> mBbq;

    mutable sp<BLASTBufferQueue> mBbq;

    mutable sp<SurfaceControl> mBbqChild;

    mutable sp<SurfaceControl> mBbqChild;

    int32_t mLayerId;



    uint32_t mTransformHint;

    int32_t mLayerId = 0;

    uint32_t mWidth;

    uint32_t mTransformHint = 0;

    uint32_t mHeight;

    uint32_t mWidth = 0;

    PixelFormat mFormat;

    uint32_t mHeight = 0;

    uint32_t mCreateFlags;

    PixelFormat mFormat = PIXEL_FORMAT_NONE;

    uint32_t mCreateFlags = 0;

};

};





}; // namespace android

}; // namespace android