commit 827de1993271f28110696df6ff809947184ba550
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 22 19:09:03 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 22 19:09:03 2018 +0000
tree 1f2e2f76bd214c8e6093d3d99b462cf610f023b4
parent 9971005cd3d29dd0ddf4e37ab7171d1fbfc55586
parent fe26dfb3bf347d801e4ef2803e1ffa3c924a851b

Merge "lmkd: Do not set soft_limit_in_bytes on high-end devices"

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 9463cc9..6493262 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -507,7 +507,8 @@
 static std::string make_temporary_directory() {
     std::string result(make_temporary_template());
     if (mkdtemp(&result[0]) == nullptr) {
-        die("unable to create temporary directory: %s", strerror(errno));
+        die("unable to create temporary directory with template %s: %s",
+            result.c_str(), strerror(errno));
     }
     return result;
 }
@@ -516,7 +517,8 @@
     std::string path_template(make_temporary_template());
     int fd = mkstemp(&path_template[0]);
     if (fd == -1) {
-        die("failed to create temporary file for %s: %s\n", what, strerror(errno));
+        die("failed to create temporary file for %s with template %s: %s\n",
+            path_template.c_str(), what, strerror(errno));
     }
     unlink(path_template.c_str());
     return fd;

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 32cf0ee..741fde0 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -372,6 +372,7 @@
 
             int result = TEMP_FAILURE_RETRY(recv(socket_, data, bytes_left, MSG_DONTWAIT));
             if (result <= 0) {
+                PLOG(ERROR) << "sys_prop: recv error";
                 return false;
             }
 
@@ -379,6 +380,10 @@
             data += result;
         }
 
+        if (bytes_left != 0) {
+            LOG(ERROR) << "sys_prop: recv data is not properly obtained.";
+        }
+
         return bytes_left == 0;
     }