summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-04-04 17:14:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-04 17:14:32 +0000
commitd334b826c9caf065e5938aeb8c72363c8f4f8b37 (patch)
tree9e64ab3104b3471504151fed34fef3b9c98c8c5a
parent9261e262cb9a7fd3f04b854c20a8023560389030 (diff)
parent08686936b5cc986e576736275ce786792eecd72a (diff)
downloadcore-d334b826c9caf065e5938aeb8c72363c8f4f8b37.tar.gz
Merge changes I456aa53d,I286c6947 into main
* changes: getevent: print error message when failing to get event getevent: add Framework Input team as owners
-rw-r--r--toolbox/OWNERS1
-rw-r--r--toolbox/getevent.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/toolbox/OWNERS b/toolbox/OWNERS
index 5e2c5813f..898ddce5f 100644
--- a/toolbox/OWNERS
+++ b/toolbox/OWNERS
@@ -1,2 +1,3 @@
include platform/system/core:/janitors/OWNERS
per-file modprobe.c=willmcvicker@google.com,dvander@google.com
+per-file getevent.c=file:platform/frameworks/base:/INPUT_OWNERS
diff --git a/toolbox/getevent.c b/toolbox/getevent.c
index f65bb20b5..7b896e9ec 100644
--- a/toolbox/getevent.c
+++ b/toolbox/getevent.c
@@ -441,7 +441,7 @@ static int read_notify(const char *dirname, int nfd, int print_flags)
if(res < (int)sizeof(*event)) {
if(errno == EINTR)
return 0;
- fprintf(stderr, "could not get event, %s\n", strerror(errno));
+ fprintf(stderr, "could not get inotify events, %s\n", strerror(errno));
return 1;
}
//printf("got %d bytes of event information\n", res);
@@ -664,7 +664,7 @@ int getevent_main(int argc, char *argv[])
if(ufds[i].revents & POLLIN) {
res = read(ufds[i].fd, &event, sizeof(event));
if(res < (int)sizeof(event)) {
- fprintf(stderr, "could not get event\n");
+ fprintf(stderr, "could not get evdev event, %s\n", strerror(errno));
return 1;
}
if(get_time) {