diff options
| author | Marco Nelissen <marcone@google.com> | 2014-12-22 19:28:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-22 19:28:04 +0000 |
| commit | 0b87c0d9e074384d05e6563c1b1cf5dbd5246436 (patch) | |
| tree | fc297e71dcf2e918cf769237946f00c3b635eac2 /media/libmediaplayerservice | |
| parent | 0272c12dd7def396d022c6eec80c3b28c544721b (diff) | |
| parent | bd08223c450a7a2e8e8d79e6be148ed1ac64caa3 (diff) | |
| download | frameworks_av-0b87c0d9e074384d05e6563c1b1cf5dbd5246436.zip frameworks_av-0b87c0d9e074384d05e6563c1b1cf5dbd5246436.tar.gz frameworks_av-0b87c0d9e074384d05e6563c1b1cf5dbd5246436.tar.bz2 | |
am bd08223c: Merge "Fix double close."
* commit 'bd08223c450a7a2e8e8d79e6be148ed1ac64caa3':
Fix double close.
Diffstat (limited to 'media/libmediaplayerservice')
| -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; } |