Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd08223c authored by Marco Nelissen's avatar Marco Nelissen Committed by Gerrit Code Review
Browse files

Merge "Fix double close."

parents 1ec00eab 5225ba06

media/libmedia/IMediaPlayerService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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);

media/libmediaplayerservice/MediaPlayerService.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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;

}