Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fca092d9 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am f4431278: am 19afb386: Merge "Remove streaming URI from default logs" 

* commit 'f4431278':
  Remove streaming URI from default logs
parents 7f7ccb9e f4431278

media/libstagefright/httplive/LiveSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

media/libstagefright/httplive/M3UParser.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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>.");

                }

            }

media/libstagefright/rtsp/ARTSPConnection.cpp

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) { 
        // right here, since we currently have no way of asking the user

        // for this information.



        ALOGE("Malformed rtsp url %s", url.c_str());

        ALOGE("Malformed rtsp url <URL suppressed>");



        reply->setInt32("result", ERROR_MALFORMED);

        reply->post();

media/libstagefright/rtsp/MyHandler.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ struct MyHandler : public AHandler { 
            mSessionURL.append(StringPrintf("%u", port));

            mSessionURL.append(path);



            ALOGI("rewritten session url: '%s'", mSessionURL.c_str());

            ALOGV("rewritten session url: '%s'", mSessionURL.c_str());

        }



        mSessionHost = host;

media/libstagefright/rtsp/SDPLoader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ void SDPLoader::onLoad(const sp<AMessage> &msg) { 
    msg->findPointer("headers", (void **)&headers);



    if (!(mFlags & kFlagIncognito)) {

        ALOGI("onLoad '%s'", url.c_str());

        ALOGV("onLoad '%s'", url.c_str());

    } else {

        ALOGI("onLoad <URL suppressed>");

    }