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

Commit 05ea6434 authored by Andreas Huber's avatar Andreas Huber
Browse files

Squashed commit of the following: 

commit 0d5694ba2d399dd0869532a4d6256448185a1be0
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:59:23 2010 -0700

    suspend() and resume() methods on VideoView are back but don't do anything.

    They need to be back because they were public before.

    Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425

commit 16192891ed7d349ee97e47d1729d20a2d0d247b8
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:47:05 2010 -0700

    Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming."

    This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25.

    Conflicts:

    	api/current.xml

    Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5

commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:44:16 2010 -0700

    Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."

    This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f.

commit f2ed03550887986f39d36b5dabcd9e919949c7cf
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:44:08 2010 -0700

    Revert "Release MediaPlayer if suspend() returns false."

    This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268.

commit 441ecce678bd24e9660a72c8627b5bd94433ff8b
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 29 11:40:46 2010 -0700

    manually.

    Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87

Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
parent c8ca26ed

include/media/IMediaPlayer.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ public: 
    virtual status_t        setAudioStreamType(int type) = 0;

    virtual status_t        setLooping(int loop) = 0;

    virtual status_t        setVolume(float leftVolume, float rightVolume) = 0;

    virtual status_t        suspend() = 0;

    virtual status_t        resume() = 0;

    virtual status_t        setAuxEffectSendLevel(float level) = 0;

    virtual status_t        attachAuxEffect(int effectId) = 0;

include/media/MediaPlayerInterface.h

+0 −2
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ public: 
    virtual status_t    reset() = 0;

    virtual status_t    setLooping(int loop) = 0;

    virtual player_type playerType() = 0;

    virtual status_t    suspend() { return INVALID_OPERATION; }

    virtual status_t    resume() { return INVALID_OPERATION; }



    virtual void        setNotifyCallback(void* cookie, notify_callback_f notifyFunc) {

                            mCookie = cookie; mNotify = notifyFunc; }

include/media/mediaplayer.h

+0 −2
Original line number Diff line number Diff line
@@ -169,8 +169,6 @@ public: 
            status_t        invoke(const Parcel& request, Parcel *reply);

            status_t        setMetadataFilter(const Parcel& filter);

            status_t        getMetadata(bool update_only, bool apply_filter, Parcel *metadata);

            status_t        suspend();

            status_t        resume();

            status_t        setAudioSessionId(int sessionId);

            int             getAudioSessionId();

            status_t        setAuxEffectSendLevel(float level);

media/libmedia/IMediaPlayer.cpp

+0 −32
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ enum { 
    INVOKE,

    SET_METADATA_FILTER,

    GET_METADATA,

    SUSPEND,

    RESUME,

    SET_AUX_EFFECT_SEND_LEVEL,

    ATTACH_AUX_EFFECT

};
@@ -215,26 +213,6 @@ public: 
        return reply->readInt32();

    }



    status_t suspend() {

        Parcel request;

        request.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());



        Parcel reply;

        remote()->transact(SUSPEND, request, &reply);



        return reply.readInt32();

    }



    status_t resume() {

        Parcel request;

        request.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());



        Parcel reply;

        remote()->transact(RESUME, request, &reply);



        return reply.readInt32();

    }



    status_t setAuxEffectSendLevel(float level)

    {

        Parcel data, reply;
@@ -358,16 +336,6 @@ status_t BnMediaPlayer::onTransact( 
            reply->writeInt32(setMetadataFilter(data));

            return NO_ERROR;

        } break;

        case SUSPEND: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            reply->writeInt32(suspend());

            return NO_ERROR;

        } break;

        case RESUME: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            reply->writeInt32(resume());

            return NO_ERROR;

        } break;

        case GET_METADATA: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            const status_t retcode = getMetadata(data.readInt32(), data.readInt32(), reply);

media/libmedia/mediaplayer.cpp

+0 −10
Original line number Diff line number Diff line
@@ -172,16 +172,6 @@ status_t MediaPlayer::invoke(const Parcel& request, Parcel *reply) 
    return INVALID_OPERATION;

}



status_t MediaPlayer::suspend() {

    Mutex::Autolock _l(mLock);

    return mPlayer->suspend();

}



status_t MediaPlayer::resume() {

    Mutex::Autolock _l(mLock);

    return mPlayer->resume();

}



status_t MediaPlayer::setMetadataFilter(const Parcel& filter)

{

    LOGD("setMetadataFilter");