commit 1713686c4250e52066bee9c5b4838b6a11490662
author qctecmdr <qctecmdr@localhost> Thu Mar 21 07:21:22 2024 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 21 07:21:22 2024 -0700
tree 6bbd7e58f7a4a23080b73ba79fe442aa33fdd829
parent a3afa4603ab89f2244bc57b779446eefe293ffdf
parent ca2906cedbdaf97e9d64bc10a29f9bf25356ebcf

Merge "gralloc: Fix AOSP Clang Compiler error"

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;