| commit | 064e1c0928df0660d7e37f616fcc85fb55f3fe5f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Sep 13 17:07:12 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 13 17:07:12 2024 +0000 |
| tree | bdc8a74fa97aa4afe0ba182ae306d2d4e057ff7c | |
| parent | 0f0123f8d74430882e5b3ba715570694350556f1 [diff] | |
| parent | 357c2ed35dce4aeefb3bfbd36d312a6c7fbc9af6 [diff] |
Merge "Make invalid FD a fatal error in FdTrigger" into main am: 357c2ed35d Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3260555 Change-Id: Ia0857aec67e0d3baf3e6cbf82842b65b9789f50a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/FdTrigger.cpp b/libs/binder/FdTrigger.cpp index f0aa801..7263e23 100644 --- a/libs/binder/FdTrigger.cpp +++ b/libs/binder/FdTrigger.cpp
@@ -108,7 +108,7 @@ // POLLNVAL: invalid FD number, e.g. not opened. if (pfd[0].revents & POLLNVAL) { - ALOGE("Invalid FD number (%d) in FdTrigger (POLLNVAL)", pfd[0].fd); + LOG_ALWAYS_FATAL("Invalid FD number (%d) in FdTrigger (POLLNVAL)", pfd[0].fd); return BAD_VALUE; }