commit 36cff7cc0aca7da2fc0ce1bec22b00a7b4a4aabf
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 04 00:35:38 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 04 00:35:38 2022 +0000
tree 99fabb283d5a0fe04c9bce37098e59bd8a09f1f5
parent c226dcf6a2e9793dde56a01e4621f3de83986e7d
parent a7c45f4f5aa275628c2ad6e72ef12bed84535d0e

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

libs/gui/SurfaceControl.cpp

diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
index 6529a4e..f93b799 100644
--- a/libs/gui/SurfaceControl.cpp
+++ b/libs/gui/SurfaceControl.cpp
@@ -70,6 +70,7 @@
     mLayerId = other->mLayerId;
     mWidth = other->mWidth;
     mHeight = other->mHeight;
+    mFormat = other->mFormat;
     mCreateFlags = other->mCreateFlags;
 }
 

libs/gui/include/gui/SurfaceControl.h

diff --git a/libs/gui/include/gui/SurfaceControl.h b/libs/gui/include/gui/SurfaceControl.h
index 9ee4636..ed14ec6 100644
--- a/libs/gui/include/gui/SurfaceControl.h
+++ b/libs/gui/include/gui/SurfaceControl.h
@@ -118,12 +118,13 @@
     mutable sp<Surface>         mSurfaceData;
     mutable sp<BLASTBufferQueue> mBbq;
     mutable sp<SurfaceControl> mBbqChild;
-    int32_t mLayerId;
-    uint32_t mTransformHint;
-    uint32_t mWidth;
-    uint32_t mHeight;
-    PixelFormat mFormat;
-    uint32_t mCreateFlags;
+
+    int32_t mLayerId = 0;
+    uint32_t mTransformHint = 0;
+    uint32_t mWidth = 0;
+    uint32_t mHeight = 0;
+    PixelFormat mFormat = PIXEL_FORMAT_NONE;
+    uint32_t mCreateFlags = 0;
 };
 
 }; // namespace android