commit ccf23537eeacfa47e5f18dd3b75089886d177c1b
author Tom Cherry <tomcherry@google.com> Tue Mar 28 16:40:41 2017 -0700
committer Keun-young Park <keunyoung@google.com> Wed Mar 29 10:07:54 2017 -0700
tree cadcde5aa295377ca4613fde651a20e2e8bb7a26
parent ec16825cb8130420dbdd0ca7086f5f1c7ad469a8

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

init/keychords.cpp

diff --git a/init/keychords.cpp b/init/keychords.cpp
index 3dbb2f0..5801ea8 100644
--- a/init/keychords.cpp
+++ b/init/keychords.cpp
@@ -23,9 +23,10 @@
 #include <linux/keychord.h>
 #include <unistd.h>
 
+#include <android-base/properties.h>
+
 #include "init.h"
 #include "log.h"
-#include "property_service.h"
 #include "service.h"
 
 static struct input_keychord *keychords = 0;
@@ -74,7 +75,7 @@
     }
 
     // Only handle keychords if adb is enabled.
-    std::string adb_enabled = property_get("init.svc.adbd");
+    std::string adb_enabled = android::base::GetProperty("init.svc.adbd", "");
     if (adb_enabled == "running") {
         Service* svc = ServiceManager::GetInstance().FindServiceByKeychord(id);
         if (svc) {