diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-12 20:34:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-12 20:34:55 +0000 |
| commit | fca092d953e04c7169242200f0ddb914a9f54ea4 (patch) | |
| tree | d2f450bd5cecda7ce63e89d9f36b5877933115ad /media/libstagefright/httplive | |
| parent | 7f7ccb9e923a8b8e87b8866dede3eafbbbeb11a1 (diff) | |
| parent | f4431278a9613f55ecd944ab2e3eb615b372f269 (diff) | |
| download | frameworks_av-fca092d953e04c7169242200f0ddb914a9f54ea4.zip frameworks_av-fca092d953e04c7169242200f0ddb914a9f54ea4.tar.gz frameworks_av-fca092d953e04c7169242200f0ddb914a9f54ea4.tar.bz2 | |
am f4431278: am 19afb386: Merge "Remove streaming URI from default logs"
* commit 'f4431278a9613f55ecd944ab2e3eb615b372f269':
Remove streaming URI from default logs
Diffstat (limited to 'media/libstagefright/httplive')
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index dd396e7..19db6eb 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -488,7 +488,7 @@ void LiveSession::onConnect(const sp<AMessage> &msg) { mPlaylist = fetchPlaylist(url.c_str(), NULL /* curPlaylistHash */, &dummy); if (mPlaylist == NULL) { - ALOGE("unable to fetch master playlist '%s'.", url.c_str()); + ALOGE("unable to fetch master playlist <URL suppressed>."); postPrepared(ERROR_IO); return; diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index 87918c8..dacdd40 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -798,8 +798,7 @@ status_t M3UParser::parseCipherInfo( if (MakeURL(baseURI.c_str(), val.c_str(), &absURI)) { val = absURI; } else { - ALOGE("failed to make absolute url for '%s'.", - val.c_str()); + ALOGE("failed to make absolute url for <URL suppressed>."); } } |