commit 5dacbef0448c20718725376d6d3d30d6a1983d3f
author Eino-Ville Talvala <etalvala@google.com> Tue Jun 13 12:43:19 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 16 18:12:59 2017 +0000
tree 0dee75a4a9f1368ba4ca6a2bbd75c673bc085b2d
parent a48fb26909f6b4c82c89be9e99ef866abb724075

ImageReader: Set BufferItem mGraphicBuffer to null when returning it

The ImageReader JNI layer needs to maintain a list of BufferItems that
back the Java Image objects. At start, we allocate maxImages of these
in a list, and acquire and release them from this list as the
application acquires and releases Images.

However, on release, the contents of the BufferItem are not adjusted,
so it can retain a reference to a GraphicBuffer until the BufferItem
is reused.

Test: Camera CTS passes, memory usage drops after camera bursts
Bug: 62652080
Change-Id: I9aade5e32cbe0af0c15a3886e16ada1a70392b74
(cherry picked from commit 0af9435572aa4ef66c61a62605f6eb3f8d218d8b)

media/jni/android_media_ImageReader.cpp

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