commit b7d92975caf2f0f4b9ef6f9c880bf814f7a2968b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Apr 04 23:22:31 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Apr 04 23:22:31 2023 +0000
tree 4280959c9a0dc57f834a7d089e54ef783c2d704d
parent 607c57bdc3102bab34fb881c802c4bf8b3c053ac
parent 0667ff33b20a27e7fd08ea497ff922aa081e241a

Snap for 9883365 from 0667ff33b20a27e7fd08ea497ff922aa081e241a to tm-qpr3-release

Change-Id: I25a07a5ac911ecb6acf4c324af9aa44eff562bf9

gralloc/gr_buf_mgr.cpp

diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp
index cd14a6b..abdef85 100644
--- a/gralloc/gr_buf_mgr.cpp
+++ b/gralloc/gr_buf_mgr.cpp
@@ -765,9 +765,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));