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

Commit 504e6ade authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

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

am: 09b5fd9c

Change-Id: I45e45e8f550922ef86daee7febf0ee6e4f427e95
parents f9e1b9c3 09b5fd9c

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

+3 −3
Original line number Diff line number Diff line
@@ -152,7 +152,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)) ||
@@ -169,7 +169,7 @@ status_t MediaPlayer::setDataSource(int fd, int64_t offset, int64_t length) 
{

    ALOGV("setDataSource(%d, %" PRId64 ", %" PRId64 ")", 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)) ||
@@ -185,7 +185,7 @@ status_t MediaPlayer::setDataSource(const sp<IDataSource> &source) 
{

    ALOGV("setDataSource(IDataSource)");

    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)) ||

media/libmedia/mediarecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ MediaRecorder::MediaRecorder(const String16& opPackageName) : mSurfaceMediaSourc 
{

    ALOGV("constructor");



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

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

    if (service != NULL) {

        mMediaRecorder = service->createMediaRecorder(opPackageName);

    }