commit b3d0b86586eb530e6532eb2a851d616c253f5a3d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 25 18:24:28 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 25 18:24:30 2017 +0000
tree 0e5a9d106e968185fa4b160ba8ed13630b4ff2e5
parent 33689d666b91d093ff537f8539cdbdcb596e7239
parent 824e31fdf57daef2f8b86839c70cbc996cf57e5e

Merge "fs_mgr: support using libavb to enable dm-verity"

include/cutils/klog.h

diff --git a/include/cutils/klog.h b/include/cutils/klog.h
index e7cd300..5ae6216 100644
--- a/include/cutils/klog.h
+++ b/include/cutils/klog.h
@@ -23,7 +23,6 @@
 
 __BEGIN_DECLS
 
-int  klog_get_level(void);
 void klog_set_level(int level);
 
 void klog_write(int level, const char *fmt, ...)

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index b2f6411..d323425 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -381,7 +381,7 @@
 static void handle_property_set_fd() {
     static constexpr uint32_t kDefaultSocketTimeout = 2000; /* ms */
 
-    int s = accept(property_set_fd, nullptr, nullptr);
+    int s = accept4(property_set_fd, nullptr, nullptr, SOCK_CLOEXEC);
     if (s == -1) {
         return;
     }

libcutils/klog.cpp

diff --git a/libcutils/klog.cpp b/libcutils/klog.cpp
index 15adf6b..d301276 100644
--- a/libcutils/klog.cpp
+++ b/libcutils/klog.cpp
@@ -29,10 +29,6 @@
 
 static int klog_level = KLOG_INFO_LEVEL;
 
-int klog_get_level(void) {
-    return klog_level;
-}
-
 void klog_set_level(int level) {
     klog_level = level;
 }