Snap for 5470312 from 3624615bc01fd9c3ef81d3324cf6a11ee0cfc630 to qt-release
Change-Id: Ia3fa4eb9308f151328662d58188404c276b1ff50
diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp
index 851f3b0..3706bc6 100644
--- a/system/gralloc/gralloc.cpp
+++ b/system/gralloc/gralloc.cpp
@@ -389,7 +389,7 @@
if ((doLocked && is_rgb_format) ||
(!grdma && (doLocked || !is_rgb_format))) {
convertedBuf.resize(rgbSz);
- to_send = convertedBuf.data();
+ to_send = &convertedBuf.front();
send_buffer_size = rgbSz;
}
@@ -457,6 +457,8 @@
//
// gralloc device functions (alloc interface)
//
+static void gralloc_dump(struct alloc_device_t* /*dev*/, char* /*buff*/, int /*buff_len*/) {}
+
static int gralloc_alloc(alloc_device_t* dev,
int w, int h, int format, int usage,
buffer_handle_t* pHandle, int* pStride)
@@ -1430,6 +1432,7 @@
dev->device.alloc = gralloc_alloc;
dev->device.free = gralloc_free;
+ dev->device.dump = gralloc_dump;
pthread_mutex_init(&dev->lock, NULL);
*device = &dev->device.common;