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

Commit cfb2c130 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Remove no longer needed http proxy handling code, it's obsolete now"

parents 0f1f2826 81e68448

include/media/IMediaPlayerService.h

+0 −3
Original line number Diff line number Diff line
@@ -99,9 +99,6 @@ public: 


    virtual void addBatteryData(uint32_t params) = 0;

    virtual status_t pullBatteryData(Parcel* reply) = 0;



    virtual status_t updateProxyConfig(

            const char *host, int32_t port, const char *exclusionList) = 0;

};



// ----------------------------------------------------------------------------

include/media/MediaPlayerInterface.h

+0 −5
Original line number Diff line number Diff line
@@ -214,11 +214,6 @@ public: 
        return INVALID_OPERATION;

    }



    virtual status_t updateProxyConfig(

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

        return INVALID_OPERATION;

    }



private:

    friend class MediaPlayerService;

include/media/mediaplayer.h

+0 −3
Original line number Diff line number Diff line
@@ -250,9 +250,6 @@ public: 
            status_t        setRetransmitEndpoint(const char* addrString, uint16_t port);

            status_t        setNextMediaPlayer(const sp<MediaPlayer>& player);



            status_t updateProxyConfig(

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



private:

            void            clear_l();

            status_t        seekTo_l(int msec);

media/libmedia/IMediaPlayerService.cpp

+0 −38
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ enum { 
    ADD_BATTERY_DATA,

    PULL_BATTERY_DATA,

    LISTEN_FOR_REMOTE_DISPLAY,

    UPDATE_PROXY_CONFIG,

};



class BpMediaPlayerService: public BpInterface<IMediaPlayerService>
@@ -192,25 +191,6 @@ public: 
        remote()->transact(LISTEN_FOR_REMOTE_DISPLAY, data, &reply);

        return interface_cast<IRemoteDisplay>(reply.readStrongBinder());

    }



    virtual status_t updateProxyConfig(

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

        Parcel data, reply;



        data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());

        if (host == NULL) {

            data.writeInt32(0);

        } else {

            data.writeInt32(1);

            data.writeCString(host);

            data.writeInt32(port);

            data.writeCString(exclusionList);

        }



        remote()->transact(UPDATE_PROXY_CONFIG, data, &reply);



        return reply.readInt32();

    }

};



IMPLEMENT_META_INTERFACE(MediaPlayerService, "android.media.IMediaPlayerService");
@@ -338,24 +318,6 @@ status_t BnMediaPlayerService::onTransact( 
            reply->writeStrongBinder(display->asBinder());

            return NO_ERROR;

        } break;

        case UPDATE_PROXY_CONFIG:

        {

            CHECK_INTERFACE(IMediaPlayerService, data, reply);



            const char *host = NULL;

            int32_t port = 0;

            const char *exclusionList = NULL;



            if (data.readInt32()) {

                host = data.readCString();

                port = data.readInt32();

                exclusionList = data.readCString();

            }



            reply->writeInt32(updateProxyConfig(host, port, exclusionList));



            return OK;

        }

        default:

            return BBinder::onTransact(code, data, reply, flags);

    }

media/libmedia/mediaplayer.cpp

+0 −11
Original line number Diff line number Diff line
@@ -838,15 +838,4 @@ status_t MediaPlayer::setNextMediaPlayer(const sp<MediaPlayer>& next) { 
    return mPlayer->setNextPlayer(next == NULL ? NULL : next->mPlayer);

}



status_t MediaPlayer::updateProxyConfig(

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

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



    if (service != NULL) {

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

    }



    return INVALID_OPERATION;

}



}; // namespace android