commit 0ffb47b5d45607786932cc197f94b63ee2d88904
author Mark Salyzyn <salyzyn@google.com> Tue Mar 28 17:09:15 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 28 17:09:15 2017 +0000
tree b898b257f1297821588a337cca98779f53ae334a
parent 826a4a3334c9e46b42ad629d784c3b68ae78864b
parent e9fc328929f877cf4e46488d0f5ea06324700aa0

Merge "libcutils: handle root directory empty path"

fs_mgr/fs_mgr_boot_config.cpp

diff --git a/fs_mgr/fs_mgr_boot_config.cpp b/fs_mgr/fs_mgr_boot_config.cpp
index 5b2f218..cffa6ce 100644
--- a/fs_mgr/fs_mgr_boot_config.cpp
+++ b/fs_mgr/fs_mgr_boot_config.cpp
@@ -56,7 +56,7 @@
             return true;
         }
 
-        LERROR << "Error finding '" << key << "' in device tree";
+        LINFO << "Error finding '" << key << "' in device tree";
     }
 
     return false;

logd/LogBufferElement.cpp

diff --git a/logd/LogBufferElement.cpp b/logd/LogBufferElement.cpp
index 81356fe..04a620c 100644
--- a/logd/LogBufferElement.cpp
+++ b/logd/LogBufferElement.cpp
@@ -235,7 +235,9 @@
     }
     iovec[1].iov_len = entry.len;
 
-    log_time retval = reader->sendDatav(iovec, 2) ? FLUSH_ERROR : mRealTime;
+    log_time retval = reader->sendDatav(iovec, 1 + (entry.len != 0))
+                          ? FLUSH_ERROR
+                          : mRealTime;
 
     if (buffer) free(buffer);