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

Commit 89efdc9c authored by Wink Saville's avatar Wink Saville Committed by The Android Open Source Project
Browse files

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger. 

Automated import of CL 144245
parent 0b022b89

liblog/logd_write.c

+5 −1
Original line number Diff line number Diff line
@@ -143,12 +143,16 @@ int __android_log_write(int prio, const char *tag, const char *msg) 
    /* XXX: This needs to go! */

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

        !strcmp(tag, "RILJ") ||

        !strcmp(tag, "RILB") ||

        !strcmp(tag, "RILC") ||

        !strcmp(tag, "RILD") ||

        !strcmp(tag, "RIL") ||

        !strcmp(tag, "AT") ||

        !strcmp(tag, "GSM") ||

        !strcmp(tag, "STK"))

        !strcmp(tag, "STK") ||

        !strcmp(tag, "CDMA") ||

        !strcmp(tag, "PHONE") ||

        !strcmp(tag, "SMS"))

            log_id = LOG_ID_RADIO;



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