Snap for 7649214 from 9f8341aef81b194488a27512680419bbc55c7cf1 to mainline-resolv-release

Change-Id: I342050712903220001047daf068b0fdf29fedcad
diff --git a/logd/logd_test.cpp b/logd/logd_test.cpp
index ec09cd7..be9c91e 100644
--- a/logd/logd_test.cpp
+++ b/logd/logd_test.cpp
@@ -856,9 +856,9 @@
 
         std::string message = "getStatistics 0 1 2 3 4 5 6 7";
 
-        ASSERT_GT(write(sock1, message.c_str(), message.length()), 0);
+        ASSERT_GT(write(sock1, message.c_str(), message.length() + 1), 0);
         sock1.reset();
-        ASSERT_GT(write(sock2, message.c_str(), message.length()), 0);
+        ASSERT_GT(write(sock2, message.c_str(), message.length() + 1), 0);
 
         struct pollfd p = {.fd = sock2, .events = POLLIN, .revents = 0};