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

Commit 81077e5f authored by Wink Saville's avatar Wink Saville Committed by Gerrit Code Review
Browse files

Merge "Use Rlog instead of Log"

parents bf866aed 3761e963

liblog/logd_write.c

+14 −3
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ int __android_log_write(int prio, const char *tag, const char *msg) 
{

    struct iovec vec[3];

    log_id_t log_id = LOG_ID_MAIN;

    char tmp_tag[32];



    if (!tag)

        tag = "";
@@ -147,8 +148,12 @@ int __android_log_write(int prio, const char *tag, const char *msg) 
        !strcmp(tag, "STK") ||

        !strcmp(tag, "CDMA") ||

        !strcmp(tag, "PHONE") ||

        !strcmp(tag, "SMS"))

        !strcmp(tag, "SMS")) {

            log_id = LOG_ID_RADIO;

            // Inform third party apps/ril/radio.. to use Rlog or RLOG

            snprintf(tmp_tag, sizeof(tmp_tag), "use-Rlog/RLOG-%s", tag);

            tag = tmp_tag;

    }



    vec[0].iov_base   = (unsigned char *) &prio;

    vec[0].iov_len    = 1;
@@ -163,12 +168,14 @@ int __android_log_write(int prio, const char *tag, const char *msg) 
int __android_log_buf_write(int bufID, int prio, const char *tag, const char *msg)

{

    struct iovec vec[3];

    char tmp_tag[32];



    if (!tag)

        tag = "";



    /* XXX: This needs to go! */

    if (!strcmp(tag, "HTC_RIL") ||

    if ((bufID != LOG_ID_RADIO) &&

         (!strcmp(tag, "HTC_RIL") ||

        !strncmp(tag, "RIL", 3) || /* Any log tag with "RIL" as the prefix */

        !strncmp(tag, "IMS", 3) || /* Any log tag with "IMS" as the prefix */

        !strcmp(tag, "AT") ||
@@ -176,8 +183,12 @@ int __android_log_buf_write(int bufID, int prio, const char *tag, const char *ms 
        !strcmp(tag, "STK") ||

        !strcmp(tag, "CDMA") ||

        !strcmp(tag, "PHONE") ||

        !strcmp(tag, "SMS"))

        !strcmp(tag, "SMS"))) {

            bufID = LOG_ID_RADIO;

            // Inform third party apps/ril/radio.. to use Rlog or RLOG

            snprintf(tmp_tag, sizeof(tmp_tag), "use-Rlog/RLOG-%s", tag);

            tag = tmp_tag;

    }



    vec[0].iov_base   = (unsigned char *) &prio;

    vec[0].iov_len    = 1;