commit 25c20aefd16413368e9181054426d1c3cca18765
author Andy Hung <hunga@google.com> Thu Sep 15 18:19:49 2016 -0700
committer gitbuildkicker <android-build@google.com> Mon Sep 19 15:45:14 2016 -0700
tree 0fcc4eb7f7902548b2a68c1a179b181dca95daef
parent 8f4cd95365571b6b044a2839bbd2fa3bacc37cf9

IMediaSource: fix local MediaBufferGroup refcount

Bug: 31526329
Change-Id: Ib596454e1c224e135dd51f95b0182f86d9e76f55
(cherry picked from commit 9996d9d39618b89d0f85c98b8036f003290f0d7e)

media/libmedia/IMediaSource.cpp

diff --git a/media/libmedia/IMediaSource.cpp b/media/libmedia/IMediaSource.cpp
index 5289c5f..595bad9 100644
--- a/media/libmedia/IMediaSource.cpp
+++ b/media/libmedia/IMediaSource.cpp
@@ -412,11 +412,11 @@
                     reply->writeInt32(offset);
                     reply->writeInt32(length);
                     buf->meta_data()->writeToParcel(*reply);
-                    if (transferBuf == buf) {
-                        buf->addRemoteRefcount(1);
-                        if (!supportNonblockingRead()) {
-                            maxNumBuffers = 0; // stop readMultiple with one shared buffer.
-                        }
+                    transferBuf->addRemoteRefcount(1);
+                    if (transferBuf != buf) {
+                        transferBuf->release(); // release local ref
+                    } else if (!supportNonblockingRead()) {
+                        maxNumBuffers = 0; // stop readMultiple with one shared buffer.
                     }
                 } else {
                     ALOGV_IF(buf->mMemory != nullptr,