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

Commit 1f56e8a5 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge \\"Don\\'t use sp<>&\\" into lmp-mr1-ub-dev am: 277a8ab9 

am: 4905ff3b

Change-Id: Ia8ba85cf0bde2f32afb7f6704e4653c6c0e907ed
parents 8c88ef27 4905ff3b

include/media/IMediaDeathNotifier.h

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

    virtual ~IMediaDeathNotifier() { removeObitRecipient(this); }





    virtual void died() = 0;

    virtual void died() = 0;

    static const sp<IMediaPlayerService>& getMediaPlayerService();

    static const sp<IMediaPlayerService> getMediaPlayerService();





private:

private:

    IMediaDeathNotifier &operator=(const IMediaDeathNotifier &);

    IMediaDeathNotifier &operator=(const IMediaDeathNotifier &);

media/libmedia/IMediaDeathNotifier.cpp

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

SortedVector< wp<IMediaDeathNotifier> > IMediaDeathNotifier::sObitRecipients;





// establish binder interface to MediaPlayerService

// establish binder interface to MediaPlayerService

/*static*/const sp<IMediaPlayerService>&

/*static*/const sp<IMediaPlayerService>

IMediaDeathNotifier::getMediaPlayerService()

IMediaDeathNotifier::getMediaPlayerService()

{

{

    ALOGV("getMediaPlayerService");

    ALOGV("getMediaPlayerService");

media/libmedia/mediaplayer.cpp

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

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

    status_t err = BAD_VALUE;

    status_t err = BAD_VALUE;

    if (url != NULL) {

    if (url != NULL) {

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

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

        if (service != 0) {

        if (service != 0) {

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

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

            if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||

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

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

    status_t err = UNKNOWN_ERROR;

    status_t err = UNKNOWN_ERROR;

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

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

    if (service != 0) {

    if (service != 0) {

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

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

        if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||

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

{

    ALOGV("setDataSource");

    ALOGV("setDataSource");

    status_t err = UNKNOWN_ERROR;

    status_t err = UNKNOWN_ERROR;

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

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

    if (service != 0) {

    if (service != 0) {

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

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

        if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||

        if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||

media/libmedia/mediarecorder.cpp

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

{

    ALOGV("constructor");

    ALOGV("constructor");





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

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

    if (service != NULL) {

    if (service != NULL) {

        mMediaRecorder = service->createMediaRecorder(opPackageName);

        mMediaRecorder = service->createMediaRecorder(opPackageName);

    }

    }