commit 4fa0abaab7d33fe34fa3dc10c98f147c47abc6ab
author Wink Saville <wink@google.com> Wed Jan 23 09:46:52 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 23 09:46:52 2013 -0800
tree 809ccf2617b4a10d876900057fa5aa7e628c86f4
parent 513fe1be1f4fb2fc7b41a91c6133503860bb7728
parent 68773ab87d858f41ae59e796669bd78891e140db

am 68773ab8: am 2ad928a8: Merge "Rild: Ril should try to write again to the socket EAGAIN error"

* commit '68773ab87d858f41ae59e796669bd78891e140db':
  Rild: Ril should try to write again to the socket EAGAIN error

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index 1548e62..0f37cc1 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -1315,7 +1315,7 @@
         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;