summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-08-17 13:41:59 -0700
committerJames Dong <jdong@google.com>2012-08-17 13:51:09 -0700
commit53ae1640ffbfc690962f7f94694b02680c6f66cb (patch)
tree93f6e4232098ace9e3f8c3596fbd391628af9930
parent02d3c328d2c127c26ab787aa95e5240e6b7ff223 (diff)
downloadframeworks_av-53ae1640ffbfc690962f7f94694b02680c6f66cb.zip
frameworks_av-53ae1640ffbfc690962f7f94694b02680c6f66cb.tar.gz
frameworks_av-53ae1640ffbfc690962f7f94694b02680c6f66cb.tar.bz2
Don't log streaming url.
o related-to-bug: 6994761 Change-Id: I79d5549a70b3bde67ddf496cfc6283ac92b1f569
-rw-r--r--media/libstagefright/AwesomePlayer.cpp8
-rw-r--r--media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp6
-rw-r--r--media/libstagefright/httplive/LiveSession.cpp6
3 files changed, 4 insertions, 16 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 664d5dd..e18fcbc 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -281,11 +281,7 @@ status_t AwesomePlayer::setDataSource_l(
}
}
- if (!(mFlags & INCOGNITO)) {
- ALOGI("setDataSource_l('%s')", mUri.string());
- } else {
- ALOGI("setDataSource_l(URL suppressed)");
- }
+ ALOGI("setDataSource_l(URL suppressed)");
// The actual work will be done during preparation in the call to
// ::finishSetDataSource_l to avoid blocking the calling thread in
@@ -2582,7 +2578,7 @@ status_t AwesomePlayer::dump(int fd, const Vector<String16> &args) const {
fprintf(out, " AwesomePlayer\n");
if (mStats.mFd < 0) {
- fprintf(out, " URI(%s)", mStats.mURI.string());
+ fprintf(out, " URI(suppressed)");
} else {
fprintf(out, " fd(%d)", mStats.mFd);
}
diff --git a/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp b/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
index 3f0b2c2..32a0ec8 100644
--- a/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
+++ b/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
@@ -78,12 +78,8 @@ status_t ChromiumHTTPDataSource::connect_l(
disconnect_l();
}
- if (!(mFlags & kFlagIncognito)) {
- LOG_PRI(ANDROID_LOG_INFO, LOG_TAG, "connect to %s @%lld", uri, offset);
- } else {
- LOG_PRI(ANDROID_LOG_INFO, LOG_TAG,
+ LOG_PRI(ANDROID_LOG_INFO, LOG_TAG,
"connect to <URL suppressed> @%lld", offset);
- }
mURI = uri;
mContentType = String8("application/octet-stream");
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp
index 0cddd2e..93d6429 100644
--- a/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@ -167,11 +167,7 @@ void LiveSession::onConnect(const sp<AMessage> &msg) {
headers = NULL;
}
- if (!(mFlags & kFlagIncognito)) {
- ALOGI("onConnect '%s'", url.c_str());
- } else {
- ALOGI("onConnect <URL suppressed>");
- }
+ ALOGI("onConnect <URL suppressed>");
mMasterURL = url;