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

Commit e74c64e3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cleanup for #inclusivefixit." am: 69490362 am: ba9eef87 am: 830588ce 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1373453

Change-Id: Iaaa8cdc5b94125bec9b2900c3a28c40b0d434920
parents 9cfa6161 830588ce

libsysutils/src/NetlinkEvent.cpp

+0 −2
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ bool NetlinkEvent::parseIfAddrMessage(const struct nlmsghdr *nh) { 
    if (!checkRtNetlinkLength(nh, sizeof(*ifaddr)))

        return false;



    // Sanity check.

    int type = nh->nlmsg_type;

    if (type != RTM_NEWADDR && type != RTM_DELADDR) {

        SLOGE("parseIfAddrMessage on incorrect message type 0x%x\n", type);
@@ -349,7 +348,6 @@ bool NetlinkEvent::parseRtMessage(const struct nlmsghdr *nh) { 
    uint8_t type = nh->nlmsg_type;

    const char *msgname = rtMessageName(type);



    // Sanity check.

    if (type != RTM_NEWROUTE && type != RTM_DELROUTE) {

        SLOGE("%s: incorrect message type %d (%s)\n", __func__, type, msgname);

        return false;