Commit bf53ccb8 authored Aug 11, 2021 by Treehugger Robot Committed by Automerger Merge Worker Aug 11, 2021

Merge "binder: don't specify POLLHUP in .events for poll()" am: 1291f27a am:...

Merge "binder: don't specify POLLHUP in .events for poll()" am: 1291f27a am: 6de2eb35 am: 3aebb8c2 am: dc3ef2e5 am: fefc0942

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1792852

Change-Id: I665f82e37f9f01ce3e293ce72666586c561bfc35

libs/binder/FdTrigger.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ bool FdTrigger::isTriggered() {
		status_t FdTrigger::triggerablePoll(base::borrowed_fd fd, int16_t event) {
		while (true) {
		pollfd pfd[]{{.fd = fd.get(), .events = static_cast<int16_t>(event), .revents = 0},
		{.fd = mRead.get(), .events = POLLHUP, .revents = 0}};
		{.fd = mRead.get(), .events = 0, .revents = 0}};
		int ret = TEMP_FAILURE_RETRY(poll(pfd, arraysize(pfd), -1));
		if (ret < 0) {
		return -errno;