diff options
| author | Marco Nelissen <marcone@google.com> | 2014-12-22 19:36:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-22 19:36:36 +0000 |
| commit | 54bf12b85e666417957231dc06db200c6f140253 (patch) | |
| tree | c71bdb83cc42ccc6ad907297b77a5feb27c1b9e0 /media | |
| parent | 84d8cf472c6f5b80f62c4eff8de0589b4b2fee74 (diff) | |
| parent | af318e2882e0b8b1a594f079eb3d10b2daa3ff7e (diff) | |
| download | frameworks_av-54bf12b85e666417957231dc06db200c6f140253.zip frameworks_av-54bf12b85e666417957231dc06db200c6f140253.tar.gz frameworks_av-54bf12b85e666417957231dc06db200c6f140253.tar.bz2 | |
am af318e28: am 0b87c0d9: am bd08223c: Merge "Fix double close."
* commit 'af318e2882e0b8b1a594f079eb3d10b2daa3ff7e':
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 6efdfe4..cf6771e 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -1397,7 +1397,6 @@ status_t MediaPlayerService::decode(int fd, int64_t offset, int64_t length, Exit: if (player != 0) player->reset(); - ::close(fd); return status; } |