Revert "uevent.c: avoid POLLERR infinite loop"
This reverts commit e44aa092c5
.
Reason for revert: b/318929257
Change-Id: I5d114adcd3df31ea3745354d8021e50852cdc2ef
This commit is contained in:
parent
e44aa092c5
commit
682a1afcf4
2 changed files with 0 additions and 13 deletions
|
@ -79,7 +79,6 @@ cc_library_shared {
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
"android.system.suspend-V1-ndk",
|
"android.system.suspend-V1-ndk",
|
||||||
"libdl",
|
"libdl",
|
||||||
"liblog",
|
|
||||||
],
|
],
|
||||||
|
|
||||||
header_libs: [
|
header_libs: [
|
||||||
|
|
12
uevent.c
12
uevent.c
|
@ -16,8 +16,6 @@
|
||||||
|
|
||||||
#include <hardware_legacy/uevent.h>
|
#include <hardware_legacy/uevent.h>
|
||||||
|
|
||||||
#include <log/log.h>
|
|
||||||
|
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -96,16 +94,6 @@ int uevent_next_event(char* buffer, int buffer_length)
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nr > 0 && (fds.revents & POLLERR)) {
|
|
||||||
int error = 0;
|
|
||||||
socklen_t errlen = sizeof(error);
|
|
||||||
getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &errlen);
|
|
||||||
|
|
||||||
// see b/300009377, this used to be an infinite loop
|
|
||||||
// abort to try to recover
|
|
||||||
LOG_ALWAYS_FATAL("Uevent POLLERR: %s, on FD %d", strerror(error), fd);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// won't get here
|
// won't get here
|
||||||
|
|
Loading…
Reference in a new issue