summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Cervera <giulio.cervera@cyanogenmod.org>2013-07-16 05:33:33 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-07-16 05:33:33 -0700
commit73aea09045fa9bdaa09cab9111486c726f506adb (patch)
treed20588c2f6a5e2976e36004a61afbc689aa2b1e5
parenta46eeb100977e31e4d60874f514755716547ad11 (diff)
parent3be105edfb73cf8d714572f1412b0f6928b80718 (diff)
downloadandroid_hardware_ril-cm-10.1.tar.gz
android_hardware_ril-cm-10.1.tar.bz2
android_hardware_ril-cm-10.1.zip
Merge "Rild: Ril should try to write again to the socket EAGAIN error" into cm-10.1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1
-rw-r--r--libril/ril.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libril/ril.cpp b/libril/ril.cpp
index b53b485..03ac24a 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -1317,7 +1317,7 @@ blockingWrite(int fd, const void *buffer, size_t len) {
do {
written = write (fd, toWrite + writeOffset,
len - writeOffset);
- } while (written < 0 && errno == EINTR);
+ } while (written < 0 && ((errno == EINTR) || (errno == EAGAIN)));
if (written >= 0) {
writeOffset += written;