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

Commit 0ee37108 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge \"Don\'t use sp<>&\" into klp-dev 

am: 598f8d32

Change-Id: I25294fc199e7242dbb2a9700303e713734bbb37d
parents f5d9360b 598f8d32

include/media/IMediaDeathNotifier.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public: 
    virtual ~IMediaDeathNotifier() { removeObitRecipient(this); }



    virtual void died() = 0;

    static const sp<IMediaPlayerService>& getMediaPlayerService();

    static const sp<IMediaPlayerService> getMediaPlayerService();



private:

    IMediaDeathNotifier &operator=(const IMediaDeathNotifier &);

media/libmedia/IMediaDeathNotifier.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ sp<IMediaDeathNotifier::DeathNotifier> IMediaDeathNotifier::sDeathNotifier; 
SortedVector< wp<IMediaDeathNotifier> > IMediaDeathNotifier::sObitRecipients;



// establish binder interface to MediaPlayerService

/*static*/const sp<IMediaPlayerService>&

/*static*/const sp<IMediaPlayerService>

IMediaDeathNotifier::getMediaPlayerService()

{

    ALOGV("getMediaPlayerService");

media/libmedia/mediaplayer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ status_t MediaPlayer::setDataSource( 
    ALOGV("setDataSource(%s)", url);

    status_t err = BAD_VALUE;

    if (url != NULL) {

        const sp<IMediaPlayerService>& service(getMediaPlayerService());

        const sp<IMediaPlayerService> service(getMediaPlayerService());

        if (service != 0) {

            sp<IMediaPlayer> player(service->create(this, mAudioSessionId));

            if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||
@@ -158,7 +158,7 @@ status_t MediaPlayer::setDataSource(int fd, int64_t offset, int64_t length) 
{

    ALOGV("setDataSource(%d, %lld, %lld)", fd, offset, length);

    status_t err = UNKNOWN_ERROR;

    const sp<IMediaPlayerService>& service(getMediaPlayerService());

    const sp<IMediaPlayerService> service(getMediaPlayerService());

    if (service != 0) {

        sp<IMediaPlayer> player(service->create(this, mAudioSessionId));

        if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||
@@ -174,7 +174,7 @@ status_t MediaPlayer::setDataSource(const sp<IStreamSource> &source) 
{

    ALOGV("setDataSource");

    status_t err = UNKNOWN_ERROR;

    const sp<IMediaPlayerService>& service(getMediaPlayerService());

    const sp<IMediaPlayerService> service(getMediaPlayerService());

    if (service != 0) {

        sp<IMediaPlayer> player(service->create(this, mAudioSessionId));

        if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||
@@ -782,7 +782,7 @@ void MediaPlayer::notify(int msg, int ext1, int ext2, const Parcel *obj) 
{

    ALOGV("decode(%s)", url);

    status_t status;

    const sp<IMediaPlayerService>& service = getMediaPlayerService();

    const sp<IMediaPlayerService> service = getMediaPlayerService();

    if (service != 0) {

        status = service->decode(url, pSampleRate, pNumChannels, pFormat, heap, pSize);

    } else {
@@ -806,7 +806,7 @@ void MediaPlayer::died() 
{

    ALOGV("decode(%d, %lld, %lld)", fd, offset, length);

    status_t status;

    const sp<IMediaPlayerService>& service = getMediaPlayerService();

    const sp<IMediaPlayerService> service = getMediaPlayerService();

    if (service != 0) {

        status = service->decode(fd, offset, length, pSampleRate,

                                 pNumChannels, pFormat, heap, pSize);
@@ -834,7 +834,7 @@ status_t MediaPlayer::setNextMediaPlayer(const sp<MediaPlayer>& next) { 


status_t MediaPlayer::updateProxyConfig(

        const char *host, int32_t port, const char *exclusionList) {

    const sp<IMediaPlayerService>& service = getMediaPlayerService();

    const sp<IMediaPlayerService> service = getMediaPlayerService();



    if (service != NULL) {

        return service->updateProxyConfig(host, port, exclusionList);

media/libmedia/mediarecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ MediaRecorder::MediaRecorder() : mSurfaceMediaSource(NULL) 
{

    ALOGV("constructor");



    const sp<IMediaPlayerService>& service(getMediaPlayerService());

    const sp<IMediaPlayerService> service(getMediaPlayerService());

    if (service != NULL) {

        mMediaRecorder = service->createMediaRecorder();

    }