diff options
| author | 2021-09-17 20:38:01 +0000 | |
|---|---|---|
| committer | 2021-09-17 20:38:01 +0000 | |
| commit | bc910fa39c42078d74ca96a7a538ea51aae07cb3 (patch) | |
| tree | 357ff3184e14434f1ad97aba10fa91c2e6479297 /libs/binder/FdTrigger.cpp | |
| parent | 73be4f7716178fc1fc0188d8982801d52d6e8981 (diff) | |
| parent | ddf8d7998626c14fae353b9e918932a94c0cb849 (diff) | |
Merge changes I4894c2dd,Id2977f05 am: 22a54f6a5f am: 1cfbd1bce8 am: 8b56fe841b am: ddf8d79986
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1788928
Change-Id: Ieabcd06efc50458c3794e001916739c3d3013e47
Diffstat (limited to 'libs/binder/FdTrigger.cpp')
| -rw-r--r-- | libs/binder/FdTrigger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/FdTrigger.cpp b/libs/binder/FdTrigger.cpp index ecf13dc583..49f83ff346 100644 --- a/libs/binder/FdTrigger.cpp +++ b/libs/binder/FdTrigger.cpp @@ -53,7 +53,7 @@ status_t FdTrigger::triggerablePoll(base::borrowed_fd fd, int16_t event) { continue; } if (pfd[1].revents & POLLHUP) { - return -ECANCELED; + return DEAD_OBJECT; } return pfd[0].revents & event ? OK : DEAD_OBJECT; } |