Merge "liblog: Remove paranoia regarding logd" am: 1d51753461

am: e1341c6910

* commit 'e1341c69104bb9e9bc0ad01ce5481a7bc27c159e':
  liblog: Remove paranoia regarding logd
This commit is contained in:
Mark Salyzyn 2015-12-18 21:05:57 +00:00 committed by android-build-merger
commit dd659520ce

View file

@ -880,18 +880,10 @@ int android_logger_list_read(struct logger_list *logger_list,
sigaction(SIGALRM, &old_sigaction, NULL);
}
if (ret <= 0) {
if ((ret == -1) && e) {
return -e;
}
return ret;
}
logger_for_each(logger, logger_list) {
if (log_msg->entry.lid == logger->id) {
return ret;
}
if ((ret == -1) && e) {
return -e;
}
return ret;
}
/* NOTREACH */
return ret;