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 | |
| 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')
| -rw-r--r-- | media/libmedia/IMediaPlayerService.cpp | 1 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
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 @@ status_t BnMediaPlayerService::onTransact( 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); 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; } |