commit 6c4f2ac7d84de5e2af8f6baa40536e2338b27e90
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 05 18:02:50 2024 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri Apr 05 18:02:50 2024 -0700
tree 6bbd7e58f7a4a23080b73ba79fe442aa33fdd829
parent 593b4e6d9e138a7fb27b0b578eba384ba8e63430
parent 1713686c4250e52066bee9c5b4838b6a11490662

Merge 1713686c4250e52066bee9c5b4838b6a11490662 on remote branch

Change-Id: Ie9a49fdbaf29345d012da1c24edb6f0399e02bb5

gralloc/QtiGrallocPriv.h

diff --git a/gralloc/QtiGrallocPriv.h b/gralloc/QtiGrallocPriv.h
index b20be66..2882413 100644
--- a/gralloc/QtiGrallocPriv.h
+++ b/gralloc/QtiGrallocPriv.h
@@ -182,9 +182,9 @@
         base_metadata(0),
         gpuaddr(0),
         reserved_size(0),
+        custom_content_md_reserved_size(0),
         linear_size(0),
-        ubwcp_format(format),
-        custom_content_md_reserved_size(0) {
+        ubwcp_format(format) {
     version = static_cast<int>(sizeof(native_handle));
     numInts = NumInts();
     numFds = kNumFds;

gralloc/gr_priv_handle.h

diff --git a/gralloc/gr_priv_handle.h b/gralloc/gr_priv_handle.h
index be1441b..d2c7dda 100644
--- a/gralloc/gr_priv_handle.h
+++ b/gralloc/gr_priv_handle.h
@@ -132,9 +132,9 @@
         base_metadata(0),
         gpuaddr(0),
         reserved_size(0),
+        custom_content_md_reserved_size(0),
         linear_size(0),
-        ubwcp_format(format),
-        custom_content_md_reserved_size(0) {
+        ubwcp_format(format) {
     version = static_cast<int>(sizeof(native_handle));
     numInts = NumInts();
     numFds = kNumFds;