commit bd08223c450a7a2e8e8d79e6be148ed1ac64caa3
author Marco Nelissen <marcone@google.com> Mon Dec 22 19:24:44 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 22 19:24:46 2014 +0000
tree 9000e08ccfaafa049601cb2ec1f205d4168719e4
parent 1ec00eab663c3eb74ad50fc5fc9f6b257f89a524
parent 5225ba0632e9dcf6fab562e4632ae8d6d4312959

Merge "Fix double close."

media/libmedia/IMediaPlayerService.cpp

diff --git a/media/libmedia/IMediaPlayerService.cpp b/media/libmedia/IMediaPlayerService.cpp
index a7568b9..4d33d40 100644
--- a/media/libmedia/IMediaPlayerService.cpp
+++ b/media/libmedia/IMediaPlayerService.cpp
@@ -261,6 +261,7 @@
             size_t size;
             status_t status = decode(fd, offset, length, &sampleRate, &numChannels, &format,
                                      heap, &size);
+            ::close(fd);
             reply->writeInt32(status);
             if (status == NO_ERROR) {
                 reply->writeInt32(sampleRate);

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 7bb154e..6ea522c 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1398,7 +1398,6 @@
 
 Exit:
     if (player != 0) player->reset();
-    ::close(fd);
     return status;
 }