summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eino-Ville Talvala <etalvala@google.com> 2017-06-15 21:12:29 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-15 21:12:29 +0000
commit20e2394f754e9662ca7fe9ca6dd85d7c6c08103a (patch)
treef359fc764460d9a9af4a2d7dd911ca12f7c13619
parentf9053435a3cfe4dbf358e835e6ef86eabd580df0 (diff)
parent20c2116c1f7f05b5a9628a22c4433701a89d0068 (diff)
Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev
am: 20c2116c1f Change-Id: I8385f1e65de888d602e5775f6811ec7c908f9073
-rw-r--r--media/jni/android_media_ImageReader.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index 52fadfaad984..ff115f70fb43 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -176,6 +176,7 @@ BufferItem* JNIImageReaderContext::getBufferItem() {
}
void JNIImageReaderContext::returnBufferItem(BufferItem* buffer) {
+ buffer->mGraphicBuffer = nullptr;
mBuffers.push_back(buffer);
}