diff options
| author | Andreas Huber <andih@google.com> | 2013-06-03 08:46:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 08:46:18 -0700 |
| commit | f9bb8358e454be6dc88403171db7e0e182407f17 (patch) | |
| tree | 17ae0e6c7d2b042cb5b6e444dc22ebce81340cf8 /media/libmediaplayerservice | |
| parent | 268f5ccf7b8adf80f18ef8a9dac46a0813cec19f (diff) | |
| parent | b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1 (diff) | |
| download | frameworks_av-f9bb8358e454be6dc88403171db7e0e182407f17.zip frameworks_av-f9bb8358e454be6dc88403171db7e0e182407f17.tar.gz frameworks_av-f9bb8358e454be6dc88403171db7e0e182407f17.tar.bz2 | |
am b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.
* commit 'b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1':
Update HTTP proxy configuration for all media playback inside stagefright.
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 6 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 8473c47..e600a3f 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -74,6 +74,7 @@ #include "Crypto.h" #include "Drm.h" #include "HDCP.h" +#include "HTTPBase.h" #include "RemoteDisplay.h" namespace { @@ -303,6 +304,11 @@ sp<IRemoteDisplay> MediaPlayerService::listenForRemoteDisplay( return new RemoteDisplay(client, iface.string()); } +status_t MediaPlayerService::updateProxyConfig( + const char *host, int32_t port, const char *exclusionList) { + return HTTPBase::UpdateProxyConfig(host, port, exclusionList); +} + status_t MediaPlayerService::AudioCache::dump(int fd, const Vector<String16>& args) const { const size_t SIZE = 256; diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 82dc29b..b33805d 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -256,6 +256,9 @@ public: const String8& iface); virtual status_t dump(int fd, const Vector<String16>& args); + virtual status_t updateProxyConfig( + const char *host, int32_t port, const char *exclusionList); + void removeClient(wp<Client> client); // For battery usage tracking purpose |