commit 5fded10151a97929c20732d9b4215cf14c4572e1
author Andrew Lewis <andrewlewis@google.com> Tue Jun 30 17:39:34 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 30 17:39:34 2020 +0000
tree f16e0220226f144f388d2eb9b5ecd39a564b2849
parent 2b51eb33af3c4f61708bffaa671383ef2372994b
parent 8796ef6a8accaae0f4fa18eba4f53e3e52f78824

Merge "Fix FD ownership for local FileSource" into rvc-dev am: 61375308e2 am: 971bb0305f am: 8796ef6a8a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12023202

Change-Id: I6a59ff5ce2983c75cbcb2f15d378dbda24b3058d

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index e6bb2e1..439dbe8 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -432,7 +432,7 @@
             }
             if (mDataSource == nullptr) {
                 ALOGD("FileSource local");
-                mDataSource = new PlayerServiceFileSource(mFd.get(), mOffset, mLength);
+                mDataSource = new PlayerServiceFileSource(dup(mFd.get()), mOffset, mLength);
             }
         }