commit 5ebdec43ef55e81abd011544a7c7475389755736
author Tom Cherry <tomcherry@google.com> Wed Nov 13 09:00:55 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 13 09:00:55 2019 -0800
tree c3dcac793106022762b70d40c2e080536eefedc4
parent 82dfe9ed9cd61421e930ef8e27b1d3fa61b9db20
parent 06775c4aac68c8f6b9d9b2f035552db26042e36c

Merge "Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors"
am: 02359c6d96

Change-Id: I6e0a517b28aa112e7305f81874baca1832c7ed8a

init/uevent_listener.cpp

diff --git a/init/uevent_listener.cpp b/init/uevent_listener.cpp
index 416d942..d8d9b36 100644
--- a/init/uevent_listener.cpp
+++ b/init/uevent_listener.cpp
@@ -100,7 +100,7 @@
     int n = uevent_kernel_multicast_recv(device_fd_, msg, UEVENT_MSG_LEN);
     if (n <= 0) {
         if (errno != EAGAIN && errno != EWOULDBLOCK) {
-            LOG(ERROR) << "Error reading from Uevent Fd";
+            PLOG(ERROR) << "Error reading from Uevent Fd";
         }
         return false;
     }

libcutils/uevent.cpp

diff --git a/libcutils/uevent.cpp b/libcutils/uevent.cpp
index 721de7c..bf244d2 100644
--- a/libcutils/uevent.cpp
+++ b/libcutils/uevent.cpp
@@ -60,7 +60,7 @@
     struct ucred* cred;
 
     *uid = -1;
-    ssize_t n = recvmsg(socket, &hdr, 0);
+    ssize_t n = TEMP_FAILURE_RETRY(recvmsg(socket, &hdr, 0));
     if (n <= 0) {
         return n;
     }