commit 3adc3efb280fe50afd09f13533ae2b3307944fc3
author Android Build Merger (Role) <android-build-merger@google.com> Thu Jun 15 21:42:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 15 21:43:11 2017 +0000
tree 2a49c9f55aadc6d28921c9bb5a8c4178219b0cf6
parent b73f3974122d112c930383cdd3454b4e739ac3c0
parent 3b2a5050427caffb01edc37a3b9793d20e0f01b2

Merge "Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev am: 20c2116c1f am: 20e2394f75 am: 50ba0b7196"

media/jni/android_media_ImageReader.cpp

diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index 52fadfa..ff115f70 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -176,6 +176,7 @@
 }
 
 void JNIImageReaderContext::returnBufferItem(BufferItem* buffer) {
+    buffer->mGraphicBuffer = nullptr;
     mBuffers.push_back(buffer);
 }