diff options
| author | Marco Nelissen <marcone@google.com> | 2015-06-04 15:03:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 15:03:30 +0000 |
| commit | 3b6df523db299df78052e5d2f17b0039b7523c06 (patch) | |
| tree | 6043e54c3dfe52f9d4ea380b07ed3747881ad10b /media | |
| parent | 4170eeec0a2dc2a9543b7e4674a43b3d2faac61d (diff) | |
| parent | 4136329b28f5b301cb9123009a3635a9db4a0a04 (diff) | |
| download | frameworks_av-3b6df523db299df78052e5d2f17b0039b7523c06.zip frameworks_av-3b6df523db299df78052e5d2f17b0039b7523c06.tar.gz frameworks_av-3b6df523db299df78052e5d2f17b0039b7523c06.tar.bz2 | |
Merge "Don't overwrite user agent header if app specified one" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/http/MediaHTTP.cpp | 5 |
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); |