summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-06-03 08:48:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-03 08:48:27 -0700
commit7c684c622110af460025eff85082030947278430 (patch)
tree3e29ab57fde237f80242d1c479968126d757368f /media/libmediaplayerservice
parentfaca94d1773afb50fb8aa4eb00ca213d7c9d2bec (diff)
parentf9bb8358e454be6dc88403171db7e0e182407f17 (diff)
downloadframeworks_av-7c684c622110af460025eff85082030947278430.zip
frameworks_av-7c684c622110af460025eff85082030947278430.tar.gz
frameworks_av-7c684c622110af460025eff85082030947278430.tar.bz2
am f9bb8358: am b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.
* commit 'f9bb8358e454be6dc88403171db7e0e182407f17': Update HTTP proxy configuration for all media playback inside stagefright.
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp6
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.h3
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