Merge "lmkd: use after free" am: 7c3c8c27e1

am: c95fb64f0f

Change-Id: I14be93f1bb37bab59b68c874017c4979cf9655db
This commit is contained in:
Mark Salyzyn 2018-02-07 02:40:04 +00:00 committed by android-build-merger
commit 9e11bb0cdb

View file

@ -615,11 +615,11 @@ static int kill_one_process(struct proc* procp, int min_score_adj, bool is_criti
pid_remove(pid);
if (r) {
ALOGE("kill(%d): errno=%d", procp->pid, errno);
ALOGE("kill(%d): errno=%d", pid, errno);
return -1;
} else {
return tasksize;
}
return tasksize;
}
/*