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

Commit 0b87c0d9 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am bd08223c: Merge "Fix double close." 

* commit 'bd08223c':
  Fix double close.
parents 0272c12d bd08223c

media/libmedia/IMediaPlayerService.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -261,6 +261,7 @@ status_t BnMediaPlayerService::onTransact( 
            size_t size;

            size_t size;

            status_t status = decode(fd, offset, length, &sampleRate, &numChannels, &format,

            status_t status = decode(fd, offset, length, &sampleRate, &numChannels, &format,

                                     heap, &size);

                                     heap, &size);

            ::close(fd);

            reply->writeInt32(status);

            reply->writeInt32(status);

            if (status == NO_ERROR) {

            if (status == NO_ERROR) {

                reply->writeInt32(sampleRate);

                reply->writeInt32(sampleRate);

media/libmediaplayerservice/MediaPlayerService.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -1398,7 +1398,6 @@ status_t MediaPlayerService::decode(int fd, int64_t offset, int64_t length, 




Exit:

Exit:

    if (player != 0) player->reset();

    if (player != 0) player->reset();

    ::close(fd);

    return status;

    return status;

}

}