commit e249097f6d85be2680b9a2898ff67548d47f9a70
author Tom Cherry <tomcherry@google.com> Tue Mar 28 16:40:41 2017 -0700
committer Tom Cherry <tomcherry@google.com> Wed Mar 29 13:34:56 2017 -0700
tree 63cb4480941e5425236b5b51b311f4eadaf14452
parent af5102a4f0c537d7b8f7a1fa3abc0c407a2fa26d

init: replace property_get with its android::base equivalent

Slowly try to decouple property_service.cpp from the rest of init.

Test: Boot bullhead
Change-Id: I267ae0b057bca0bf657b97cb8bfbb18199282729
(cherry picked from commit ccf23537eeacfa47e5f18dd3b75089886d177c1b)

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 0b49ba1..2844d78 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -32,7 +32,7 @@
 
 #include <android-base/file.h>
 #include <android-base/macros.h>
-#include <android-base/parseint.h>
+#include <android-base/properties.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 #include <bootloader_message/bootloader_message.h>
@@ -41,7 +41,6 @@
 #include <logwrap/logwrap.h>
 
 #include "log.h"
-#include "property_service.h"
 #include "reboot.h"
 #include "service.h"
 #include "util.h"
@@ -341,12 +340,9 @@
         abort();
     }
 
-    std::string timeout = property_get("ro.build.shutdown_timeout");
     /* TODO update default waiting time based on usage data */
-    unsigned int shutdownTimeout = 10;  // default value
-    if (android::base::ParseUint(timeout, &shutdownTimeout)) {
-        LOG(INFO) << "ro.build.shutdown_timeout set:" << shutdownTimeout;
-    }
+    unsigned int shutdownTimeout = android::base::GetUintProperty("ro.build.shutdown_timeout", 10u);
+    LOG(INFO) << "Shutdown timeout: " << shutdownTimeout;
 
     static const constexpr char* shutdown_critical_services[] = {"vold", "watchdogd"};
     for (const char* name : shutdown_critical_services) {