Merge "Revert "uevent.c: avoid POLLERR infinite loop"" into main am: ce4e1d99ad

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2901647

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

2 files changed, 0 insertions, 13 deletions

diff --git a/Android.bp b/Android.bp
index 871b1f9..409db5d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,7 +79,6 @@ cc_library_shared {
     shared_libs: [
         "android.system.suspend-V1-ndk",
         "libdl",
-        "liblog",
     ],
 
     header_libs: [
diff --git a/uevent.c b/uevent.c
index 0dcae79..e40aa2e 100644
--- a/uevent.c
+++ b/uevent.c
@@ -16,8 +16,6 @@
 
 #include <hardware_legacy/uevent.h>
 
-#include <log/log.h>
-
 #include <malloc.h>
 #include <string.h>
 #include <unistd.h>
@@ -96,16 +94,6 @@ int uevent_next_event(char* buffer, int buffer_length)
                 return count;
             } 
         }
-
-        if (nr > 0 && (fds.revents & POLLERR)) {
-            int error = 0;
-            socklen_t errlen = sizeof(error);
-            getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &errlen);
-
-            // see b/300009377, this used to be an infinite loop
-            // abort to try to recover
-            LOG_ALWAYS_FATAL("Uevent POLLERR: %s, on FD %d", strerror(error), fd);
-        }
     }
     
     // won't get here