summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/http
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-01-22 08:36:19 -0800
committerMarco Nelissen <marcone@google.com>2015-06-04 08:02:36 -0700
commit4136329b28f5b301cb9123009a3635a9db4a0a04 (patch)
tree5e79b8502d29b7f72539ed61568cbf7a400e3e42 /media/libstagefright/http
parent9c21131f254383b39b954e36df8ec57164e102c6 (diff)
downloadframeworks_av-4136329b28f5b301cb9123009a3635a9db4a0a04.zip
frameworks_av-4136329b28f5b301cb9123009a3635a9db4a0a04.tar.gz
frameworks_av-4136329b28f5b301cb9123009a3635a9db4a0a04.tar.bz2
Don't overwrite user agent header if app specified one
Bug: 19100078 https://code.google.com/p/android/issues/detail?id=103266 Change-Id: I321935a7e7a217328a5704c94e92f763c8742767
Diffstat (limited to 'media/libstagefright/http')
-rw-r--r--media/libstagefright/http/MediaHTTP.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/http/MediaHTTP.cpp b/media/libstagefright/http/MediaHTTP.cpp
index 2d9b3d4..801ff26 100644
--- a/media/libstagefright/http/MediaHTTP.cpp
+++ b/media/libstagefright/http/MediaHTTP.cpp
@@ -53,7 +53,10 @@ status_t MediaHTTP::connect(
if (headers != NULL) {
extHeaders = *headers;
}
- extHeaders.add(String8("User-Agent"), String8(MakeUserAgent().c_str()));
+
+ if (extHeaders.indexOfKey(String8("User-Agent")) < 0) {
+ extHeaders.add(String8("User-Agent"), String8(MakeUserAgent().c_str()));
+ }
bool success = mHTTPConnection->connect(uri, &extHeaders);