commit 15432b034f889e7a7e70369462013b88d1ca6658
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 22 03:48:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 22 03:48:32 2021 +0000
tree ff3a0a2d98eafc64e73c982dc1d4abdf3de93c5f
parent 1388a58dbafa235d8f27853737b79b8d91682353
parent 3301b5b0b030bfbb7cb3d2acba9e8140e8cdcbcf

Merge "libbinder: RPC sockets - remove unnecessary SIGHUP" am: 3bb5fa61e0 am: 317cf4b296 am: 1888932b8e am: 3301b5b0b0

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

Change-Id: Iff6628368f7bce34c1531ab0d0f6486197c58df8

libs/binder/RpcSession.cpp

diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index c01a03d..5fe0b00 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -181,9 +181,7 @@
 
 status_t RpcSession::FdTrigger::triggerablePoll(base::borrowed_fd fd, int16_t event) {
     while (true) {
-        pollfd pfd[]{{.fd = fd.get(),
-                      .events = static_cast<int16_t>(event | POLLHUP),
-                      .revents = 0},
+        pollfd pfd[]{{.fd = fd.get(), .events = static_cast<int16_t>(event), .revents = 0},
                      {.fd = mRead.get(), .events = POLLHUP, .revents = 0}};
         int ret = TEMP_FAILURE_RETRY(poll(pfd, arraysize(pfd), -1));
         if (ret < 0) {