ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors"

Browse source 
am: 02359c6d96

Change-Id: I6e0a517b28aa112e7305f81874baca1832c7ed8a
This commit is contained in:
Tom Cherry 2019-11-13 09:00:55 -08:00 • committed by android-build-merger
commit 777cbf21df
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/uevent_listener.cpp
View file

@ -100,7 +100,7 @@ bool UeventListener::ReadUevent(Uevent* uevent) const {
int n = uevent_kernel_multicast_recv(device_fd_, msg, UEVENT_MSG_LEN); int n = uevent_kernel_multicast_recv(device_fd_, msg, UEVENT_MSG_LEN);
if (n <= 0) { if (n <= 0) {
if (errno != EAGAIN && errno != EWOULDBLOCK) { if (errno != EAGAIN && errno != EWOULDBLOCK) {
LOG(ERROR) << "Error reading from Uevent Fd"; PLOG(ERROR) << "Error reading from Uevent Fd";
} }
return false; return false;
} }

2
libcutils/uevent.cpp
View file

@ -60,7 +60,7 @@ ssize_t uevent_kernel_recv(int socket, void* buffer, size_t length, bool require
struct ucred* cred; struct ucred* cred;
*uid = -1; *uid = -1;
ssize_t n = recvmsg(socket, &hdr, 0); ssize_t n = TEMP_FAILURE_RETRY(recvmsg(socket, &hdr, 0));
if (n <= 0) { if (n <= 0) {
return n; return n;
} }