Merge "gralloc1: Do not map metadata in gralloc"
diff --git a/libgralloc1/gr_buf_mgr.cpp b/libgralloc1/gr_buf_mgr.cpp
index 5390fee..06433e4 100644
--- a/libgralloc1/gr_buf_mgr.cpp
+++ b/libgralloc1/gr_buf_mgr.cpp
@@ -262,19 +262,10 @@
   ALOGD_IF(DEBUG, "Map buffer handle:%p id: %" PRIu64, hnd, hnd->id);
 
   hnd->base = 0;
-  hnd->base_metadata = 0;
-
   if (allocator_->MapBuffer(reinterpret_cast<void **>(&hnd->base), hnd->size, hnd->offset,
                             hnd->fd) != 0) {
     return GRALLOC1_ERROR_BAD_HANDLE;
   }
-
-  unsigned int size = ALIGN((unsigned int)sizeof(MetaData_t), getpagesize());
-  if (allocator_->MapBuffer(reinterpret_cast<void **>(&hnd->base_metadata), size,
-                            hnd->offset_metadata, hnd->fd_metadata) != 0) {
-    return GRALLOC1_ERROR_BAD_HANDLE;
-  }
-
   return GRALLOC1_ERROR_NONE;
 }