Merge "Cleanup for #inclusivefixit." am: 6949036229

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

Change-Id: I37de1f6dab8f8ee79dc6647f34b3797249ce4016
This commit is contained in:
Treehugger Robot 2020-07-28 19:50:21 +00:00 committed by Automerger Merge Worker
commit ba9eef8708

View file

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