summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-03-07 03:50:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 03:50:24 +0000
commitd4148e94e97c6abe402e819f6164276575a91936 (patch)
tree8ba953a0c9e9ea598ee48ff2eb4309eeb5bfd6cc
parent9d6abbdaccd520055fc47b6b3b36232cf23897fd (diff)
parentecac99b54ce704f282ff6706f8cfada48f41b35c (diff)
downloadsystem_core-d4148e94e97c6abe402e819f6164276575a91936.zip
system_core-d4148e94e97c6abe402e819f6164276575a91936.tar.gz
system_core-d4148e94e97c6abe402e819f6164276575a91936.tar.bz2
am ecac99b5: am 1367854a: Merge "adb: fix windows build after "forward --list" fix."
* commit 'ecac99b54ce704f282ff6706f8cfada48f41b35c': adb: fix windows build after "forward --list" fix.
-rw-r--r--adb/transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/transport.c b/adb/transport.c
index 58f685c..f35880c 100644
--- a/adb/transport.c
+++ b/adb/transport.c
@@ -1188,7 +1188,7 @@ int writex(int fd, const void *ptr, size_t len)
D("writex: fd=%d error %d: %s\n", fd, errno, strerror(errno));
if (errno == EINTR)
continue;
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ if (errno == EAGAIN) {
adb_sleep_ms(1); // just yield some cpu time
continue;
}