commit 2407e6bcee5b01f9e755e1d9747ccb9e8d74a352
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 04 00:59:01 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 04 00:59:01 2022 +0000
tree ebfcec69e7336950dbf2c87b2b416a08863fe68c
parent f2d5b2a2da277d3f4dbcb81a8e3d71d76457740a
parent 301399bc80b630e5c826ff4538c43baca32bb082

Merge changes from topic "presubmit-am-2c53fb43bdab4e97b09f15ae0a56fa78" into sc-mainline-prod

* changes:
  [automerge] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed 2p: 34fe38b0c7
  DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed

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..9a423f2 100644
--- a/libs/gui/include/gui/SurfaceControl.h
+++ b/libs/gui/include/gui/SurfaceControl.h
@@ -118,12 +118,12 @@
     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