commit 9c44e92418489d1d773a3dc2406608ebba23cc13
author android-build-team Robot <android-build-team-robot@google.com> Wed Oct 18 17:04:24 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Oct 18 17:04:24 2017 +0000
tree edeb83edad46d65f40cc5e38221b6734b4d2a4e2
parent 6f1408a52a34ac2d65085ae7f21bc13655220b2a
parent 058a6f9bf2a2c85974e5f8001dc5d8d68969390d

Snap for 4402310 from 058a6f9bf2a2c85974e5f8001dc5d8d68969390d to oc-m2-release

Change-Id: Ia23dab15015db6f9b2bd509d83579ced7b628553

msm8994/libgralloc/mapper.cpp

diff --git a/msm8994/libgralloc/mapper.cpp b/msm8994/libgralloc/mapper.cpp
index 0b091fb..8df761e 100644
--- a/msm8994/libgralloc/mapper.cpp
+++ b/msm8994/libgralloc/mapper.cpp
@@ -73,7 +73,7 @@
                   hnd, hnd->fd_metadata, strerror(errno));
             return -errno;
         }
-        hnd->base_metadata = uint64_t(mappedAddress) + hnd->offset_metadata;
+        hnd->base_metadata = uint64_t(mappedAddress);
     }
     return 0;
 }
@@ -104,7 +104,7 @@
             return -errno;
         }
 
-        hnd->base = uint64_t(mappedAddress) + hnd->offset;
+        hnd->base = uint64_t(mappedAddress);
     } else {
         // Cannot map secure buffers or framebuffers, but still need to map
         // metadata for secure buffers.

msm8996/libgralloc/mapper.cpp

diff --git a/msm8996/libgralloc/mapper.cpp b/msm8996/libgralloc/mapper.cpp
index 2ecb491..77e761d 100644
--- a/msm8996/libgralloc/mapper.cpp
+++ b/msm8996/libgralloc/mapper.cpp
@@ -73,7 +73,7 @@
                   hnd, hnd->fd_metadata, strerror(errno));
             return -errno;
         }
-        hnd->base_metadata = uint64_t(mappedAddress) + hnd->offset_metadata;
+        hnd->base_metadata = uint64_t(mappedAddress);
     }
     return 0;
 }
@@ -104,7 +104,7 @@
             return -errno;
         }
 
-        hnd->base = uint64_t(mappedAddress) + hnd->offset;
+        hnd->base = uint64_t(mappedAddress);
     } else {
         // Cannot map secure buffers or framebuffers, but still need to map
         // metadata for secure buffers.

msm8998/libqdutils/qdMetaData.cpp

diff --git a/msm8998/libqdutils/qdMetaData.cpp b/msm8998/libqdutils/qdMetaData.cpp
index 783006d..0860c81 100644
--- a/msm8998/libqdutils/qdMetaData.cpp
+++ b/msm8998/libqdutils/qdMetaData.cpp
@@ -37,8 +37,8 @@
 
 static int validateAndMap(private_handle_t* handle) {
     if (private_handle_t::validate(handle)) {
-        ALOGE("%s: Private handle is invalid - handle:%p id: %" PRIu64,
-                __func__, handle, handle->id);
+        ALOGE("%s: Private handle is invalid - handle:%p",
+                __func__, handle);
         return -1;
     }
     if (handle->fd_metadata == -1) {