diff options
| author | Marco Nelissen <marcone@google.com> | 2014-12-22 19:24:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-22 19:24:46 +0000 |
| commit | bd08223c450a7a2e8e8d79e6be148ed1ac64caa3 (patch) | |
| tree | 9000e08ccfaafa049601cb2ec1f205d4168719e4 /media/libmediaplayerservice/MediaPlayerService.cpp | |
| parent | 1ec00eab663c3eb74ad50fc5fc9f6b257f89a524 (diff) | |
| parent | 5225ba0632e9dcf6fab562e4632ae8d6d4312959 (diff) | |
| download | frameworks_av-bd08223c450a7a2e8e8d79e6be148ed1ac64caa3.zip frameworks_av-bd08223c450a7a2e8e8d79e6be148ed1ac64caa3.tar.gz frameworks_av-bd08223c450a7a2e8e8d79e6be148ed1ac64caa3.tar.bz2 | |
Merge "Fix double close."
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ status_t MediaPlayerService::decode(int fd, int64_t offset, int64_t length, Exit: if (player != 0) player->reset(); - ::close(fd); return status; } |