commit fde78a187af146baf1485d019b26cebf45c182d4
author Baldev Sahu <quic_c_bsahu@quicinc.com> Tue Apr 04 20:55:31 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 04 20:55:31 2023 +0000
tree 64dc049b9f04a72347965f3a2285299d6d9169e9
parent 3b7c0c5359d4918385c2dbd270121e642b80753a
parent a15668b90d022d933a7af56b37917a8bfbecc2d0

Gralloc: Use handle reserved size while importing buffer am: af82c80bda am: 75c033b8fb am: a15668b90d

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/display/+/22422376

Change-Id: I297d1b728748b45183ee9f21a658d85289e1bf2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

gralloc/gr_buf_mgr.cpp

diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp
index 72b72fb..61249a9 100644
--- a/gralloc/gr_buf_mgr.cpp
+++ b/gralloc/gr_buf_mgr.cpp
@@ -806,9 +806,8 @@
   auto buffer = std::make_shared<Buffer>(hnd, ion_handle, ion_handle_meta);
 
   if (hnd->base_metadata) {
-    auto metadata = reinterpret_cast<MetaData_t *>(hnd->base_metadata);
 #ifdef METADATA_V2
-    buffer->reserved_size = metadata->reservedSize;
+    buffer->reserved_size = hnd->reserved_size;
     if (buffer->reserved_size > 0) {
       buffer->reserved_region_ptr =
           reinterpret_cast<void *>(hnd->base_metadata + sizeof(MetaData_t));