commit 17e7ee63150abd36acab3443cd39b438e02dbdd1
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 01:07:29 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 01:07:29 2023 +0000
tree 64dc049b9f04a72347965f3a2285299d6d9169e9
parent 38fb96fbc6a58a4100114b05642f8765a863b7ac
parent 2f5f29a7258c2fd643817969c1dce930aceca547

Snap for 10447354 from 2f5f29a7258c2fd643817969c1dce930aceca547 to mainline-cellbroadcast-release

Change-Id: Iba3bff705c7f8c8b87e3ebb679d90f72e757e39e

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));