diff options
author | Andreas Huber <andih@google.com> | 2011-07-13 15:45:01 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-07-13 15:45:01 -0700 |
commit | dab718bba3945332dc75e268e1e7f0fe2eb91c4a (patch) | |
tree | a1c5582fc94961c13093197f5f728ae7194c931e /media/libstagefright/HTTPBase.cpp | |
parent | 42e549e4ab54802d788c43e3a04a85b7a1a95e97 (diff) | |
download | frameworks_av-dab718bba3945332dc75e268e1e7f0fe2eb91c4a.zip frameworks_av-dab718bba3945332dc75e268e1e7f0fe2eb91c4a.tar.gz frameworks_av-dab718bba3945332dc75e268e1e7f0fe2eb91c4a.tar.bz2 |
Remove legacy http support from stagefright, chromium is the new hotness.
Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
Diffstat (limited to 'media/libstagefright/HTTPBase.cpp')
-rw-r--r-- | media/libstagefright/HTTPBase.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/media/libstagefright/HTTPBase.cpp b/media/libstagefright/HTTPBase.cpp index 0d24551..f9d8501 100644 --- a/media/libstagefright/HTTPBase.cpp +++ b/media/libstagefright/HTTPBase.cpp @@ -24,10 +24,11 @@ #include "include/ChromiumHTTPDataSource.h" #endif -#include "include/NuHTTPDataSource.h" - +#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/ALooper.h> + #include <cutils/properties.h> +#include <cutils/qtaguid.h> namespace android { @@ -44,14 +45,12 @@ HTTPBase::HTTPBase() // static sp<HTTPBase> HTTPBase::Create(uint32_t flags) { #if CHROMIUM_AVAILABLE - char value[PROPERTY_VALUE_MAX]; - if (!property_get("media.stagefright.use-chromium", value, NULL) - || (strcasecmp("false", value) && strcmp("0", value))) { return new ChromiumHTTPDataSource(flags); - } else #endif { - return new NuHTTPDataSource(flags); + TRESPASS(); + + return NULL; } } @@ -135,4 +134,10 @@ bool HTTPBase::getUID(uid_t *uid) const { return true; } +// static +void HTTPBase::RegisterSocketUser(int s, uid_t uid) { + static const uint32_t kTag = 0xdeadbeef; + set_qtaguid(s, kTag, uid); +} + } // namespace android |