diff options
author | Andreas Huber <andih@google.com> | 2010-03-09 09:09:27 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-09 09:09:27 -0800 |
commit | b699c595d78e8cd7f60c2c5102d40db07b18926b (patch) | |
tree | ac897e153738a89a1d2a7cb975028332bc149ee5 | |
parent | d81f873ee1585d2440a759f7188481c4b11cc262 (diff) | |
parent | 69f722fb203371f9879f2b0c9670791ed6deb555 (diff) | |
download | frameworks_av-b699c595d78e8cd7f60c2c5102d40db07b18926b.zip frameworks_av-b699c595d78e8cd7f60c2c5102d40db07b18926b.tar.gz frameworks_av-b699c595d78e8cd7f60c2c5102d40db07b18926b.tar.bz2 |
Merge "Use a more descriptive user-agent string (similar to PV's before) in stagefright http requests."
-rw-r--r-- | media/libstagefright/HTTPDataSource.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/media/libstagefright/HTTPDataSource.cpp b/media/libstagefright/HTTPDataSource.cpp index bf020e9..d79c1bd 100644 --- a/media/libstagefright/HTTPDataSource.cpp +++ b/media/libstagefright/HTTPDataSource.cpp @@ -23,13 +23,12 @@ #include <stdlib.h> +#include <cutils/properties.h> #include <media/stagefright/HTTPDataSource.h> #include <media/stagefright/MediaDebug.h> namespace android { -static const char *kUserAgent = "stagefright-http"; - // Given a connected HTTPStream, determine if the given path redirects // somewhere else, if so, disconnect the stream, update host path and port // accordingly and return true, otherwise return false and leave the stream @@ -341,9 +340,16 @@ void HTTPDataSource::initHeaders( const KeyedVector<String8, String8> *overrides) { mHeaders = String8(); - mHeaders.append("User-Agent: "); - mHeaders.append(kUserAgent); - mHeaders.append("\r\n"); + mHeaders.append("User-Agent: stagefright/1.0 (Linux;Android "); + +#if (PROPERTY_VALUE_MAX < 8) +#error "PROPERTY_VALUE_MAX must be at least 8" +#endif + + char value[PROPERTY_VALUE_MAX]; + property_get("ro.build.version.release", value, "Unknown"); + mHeaders.append(value); + mHeaders.append(")\r\n"); if (overrides == NULL) { return; |