commit 479ce0c1f3d9ecbaf7947651a5e00828ec522f15
author Brian Carlstrom <bdc@google.com> Tue Sep 30 04:19:53 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 30 04:19:54 2014 +0000
tree 21a654cfc1992e192ea235a57174b89d147141f0
parent c75dac394e3fcd9760841a820d8a0c93dd0c276e
parent 7e5a0aca2cd81809786fad990b95f1fd404a83a5

Merge "Fix mac build for nativebridge tests." into lmp-dev

adb/adb_auth_client.c

diff --git a/adb/adb_auth_client.c b/adb/adb_auth_client.c
index 8409c63..55e9dca 100644
--- a/adb/adb_auth_client.c
+++ b/adb/adb_auth_client.c
@@ -175,7 +175,7 @@
 
     if (events & FDE_READ) {
         ret = unix_read(fd, response, sizeof(response));
-        if (ret < 0) {
+        if (ret <= 0) {
             D("Framework disconnect\n");
             if (usb_transport)
                 fdevent_remove(&usb_transport->auth_fde);

logd/LogReader.cpp

diff --git a/logd/LogReader.cpp b/logd/LogReader.cpp
index 8458c19..26df087 100644
--- a/logd/LogReader.cpp
+++ b/logd/LogReader.cpp
@@ -92,6 +92,11 @@
 
     bool nonBlock = false;
     if (strncmp(buffer, "dumpAndClose", 12) == 0) {
+        // Allow writer to get some cycles, and wait for pending notifications
+        sched_yield();
+        LogTimeEntry::lock();
+        LogTimeEntry::unlock();
+        sched_yield();
         nonBlock = true;
     }