Snap for 4402249 from ba013afe36f3954af74c81779801704bd5203283 to oc-mr1-release
Change-Id: I0b50fb7b4382ebb7f402a2f0d56689bee95cd216
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.
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.
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) {