commit 3ca376b97251ee0c4c3a3732a67231e51d270fa1
author Bart Van Assche <bvanassche@google.com> Thu Sep 05 16:11:51 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 05 16:11:51 2024 +0000
tree cf3a6e30c03e677eabe4b42130366c231512a02f
parent 2f1f91b21cadd076dee5a41ef2cac936dda87a1e
parent 1de01e677c3e4442b29d2e5a1bf01dd04f7b63b5

Merge changes If286ae5d,I0c89907e into main am: 1de01e677c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3250620

Change-Id: I292edeb5f5ebb8b4fd2c20af275f7c59024bbf5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

health/utils/libhealthloop/HealthLoop.cpp

diff --git a/health/utils/libhealthloop/HealthLoop.cpp b/health/utils/libhealthloop/HealthLoop.cpp
index 691d896..c5ad5a8 100644
--- a/health/utils/libhealthloop/HealthLoop.cpp
+++ b/health/utils/libhealthloop/HealthLoop.cpp
@@ -64,7 +64,7 @@
                                   .get();
 
     struct epoll_event ev = {
-        .events = EPOLLIN,
+        .events = EPOLLIN | EPOLLERR,
         .data.ptr = reinterpret_cast<void*>(event_handler),
     };
 
@@ -128,6 +128,9 @@
     for (;;) {
         char msg[kUeventMsgLen + 2];
         int n = uevent_kernel_multicast_recv(uevent_fd_, msg, kUeventMsgLen);
+        if (n < 0 && errno == ENOBUFS) {
+            update_stats = true;
+        }
         if (n <= 0) return update_stats;
         if (n >= kUeventMsgLen) {
             // too long -- discard
@@ -177,7 +180,7 @@
 }
 
 void HealthLoop::UeventInit(void) {
-    uevent_fd_.reset(uevent_create_socket(64 * 1024, true));
+    uevent_fd_.reset(uevent_create_socket(kUeventMsgLen, true));
 
     if (uevent_fd_ < 0) {
         KLOG_ERROR(LOG_TAG, "uevent_init: uevent_open_socket failed\n");