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

Commit 7fd7b622 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Fix mergefailure in liblog 

Change-Id: I092acba9496eefea35bff7561617e15f5424fb97
parent cf6a7e3f

liblog/logd_write.c

+2 −2
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ int __android_log_write(int prio, const char *tag, const char *msg) 
        !strcmp(tag, "QC-NETMGR-LIB") ||

        !strcmp(tag, "QC-QDP") ||

        !strcmp(tag, "Diag_Lib")

        )

        ) {

            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);
@@ -319,7 +319,7 @@ int __android_log_buf_write(int bufID, int prio, const char *tag, const char *ms 
        !strncmp(tag, "QC-QMI", 6) ||

        !strncmp(tag, "QC-ONCRPC", 9) ||

        !strncmp(tag, "QC-DSI", 6)

        )

        )) {

            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);