diff options
author | Marco Nelissen <marcone@google.com> | 2014-03-13 15:54:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 15:54:25 +0000 |
commit | 0b89a66c96b409f51e882b7d065d4b8562884faf (patch) | |
tree | 8596bc3186ce2806ad9d4970c0399ea04d40615c /media/libstagefright/httplive | |
parent | eff483b9d1b1091a307b3e7d1d786e1314ce88bf (diff) | |
parent | 19afb3869eb6a3e3733dc1f7420e1d4c3c03d376 (diff) | |
download | frameworks_av-0b89a66c96b409f51e882b7d065d4b8562884faf.zip frameworks_av-0b89a66c96b409f51e882b7d065d4b8562884faf.tar.gz frameworks_av-0b89a66c96b409f51e882b7d065d4b8562884faf.tar.bz2 |
am 19afb386: Merge "Remove streaming URI from default logs"
* commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376':
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 80aec06..ce2b934 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -485,7 +485,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 4c2c1f4..ba6bb9a 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -797,8 +797,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>."); } } |