summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2014-02-05 11:52:33 -0800
committerAndreas Huber <andih@google.com>2014-02-05 12:27:54 -0800
commit81e68448f3361eaf8618930471fdc3c21bdf5cbc (patch)
treeafc00a9a35746f18f85200755870067b4d63dd80 /media/libstagefright/rtsp
parent412d4744efae64083e4f99a664e3efaba031af48 (diff)
downloadframeworks_av-81e68448f3361eaf8618930471fdc3c21bdf5cbc.zip
frameworks_av-81e68448f3361eaf8618930471fdc3c21bdf5cbc.tar.gz
frameworks_av-81e68448f3361eaf8618930471fdc3c21bdf5cbc.tar.bz2
Remove no longer needed http proxy handling code, it's obsolete now
since we started to use java's HTTPConnection instead of the native implementation. Also remove other remnants of the previous http implementation, such as accounting for the http user's uid. Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
Diffstat (limited to 'media/libstagefright/rtsp')
-rw-r--r--media/libstagefright/rtsp/SDPLoader.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/media/libstagefright/rtsp/SDPLoader.cpp b/media/libstagefright/rtsp/SDPLoader.cpp
index 6710923..ce1e89d 100644
--- a/media/libstagefright/rtsp/SDPLoader.cpp
+++ b/media/libstagefright/rtsp/SDPLoader.cpp
@@ -35,20 +35,12 @@ namespace android {
SDPLoader::SDPLoader(
const sp<AMessage> &notify,
uint32_t flags,
- const sp<IMediaHTTPService> &httpService,
- bool uidValid,
- uid_t uid)
+ const sp<IMediaHTTPService> &httpService)
: mNotify(notify),
mFlags(flags),
- mUIDValid(uidValid),
- mUID(uid),
mNetLooper(new ALooper),
mCancelled(false),
mHTTPDataSource(new MediaHTTP(httpService->makeHTTPConnection())) {
- if (mUIDValid) {
- mHTTPDataSource->setUID(mUID);
- }
-
mNetLooper->setName("sdp net");
mNetLooper->start(false /* runOnCallingThread */,
false /* canCallJava */,
@@ -133,7 +125,7 @@ void SDPLoader::onLoad(const sp<AMessage> &msg) {
ssize_t readSize = mHTTPDataSource->readAt(0, buffer->data(), sdpSize);
if (readSize < 0) {
- ALOGE("Failed to read SDP, error code = %ld", readSize);
+ ALOGE("Failed to read SDP, error code = %d", readSize);
err = UNKNOWN_ERROR;
} else {
desc = new ASessionDescription;