diff options
| author | Andreas Huber <andih@google.com> | 2014-02-06 17:10:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-06 17:10:40 +0000 |
| commit | cfb2c130153eaf6e8bb36c5d787557e78bf9804b (patch) | |
| tree | bde84ab24027069b11217147134d5327854beccf /include | |
| parent | 0f1f2826893bd55da8e93b79830d3a7b171509e3 (diff) | |
| parent | 81e68448f3361eaf8618930471fdc3c21bdf5cbc (diff) | |
| download | frameworks_av-cfb2c130153eaf6e8bb36c5d787557e78bf9804b.zip frameworks_av-cfb2c130153eaf6e8bb36c5d787557e78bf9804b.tar.gz frameworks_av-cfb2c130153eaf6e8bb36c5d787557e78bf9804b.tar.bz2 | |
Merge "Remove no longer needed http proxy handling code, it's obsolete now"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IMediaPlayerService.h | 3 | ||||
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 5 | ||||
| -rw-r--r-- | include/media/mediaplayer.h | 3 |
3 files changed, 0 insertions, 11 deletions
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index e7ad75b..5b45376 100644 --- a/include/media/IMediaPlayerService.h +++ b/include/media/IMediaPlayerService.h @@ -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; }; // ---------------------------------------------------------------------------- diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index cd85f88..87717da 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -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; diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 00f681d..f8e4e3b 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -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); |