summaryrefslogtreecommitdiffstats
path: root/init/keychords.cpp
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2017-03-28 16:40:41 -0700
committerKeun-young Park <keunyoung@google.com>2017-03-29 10:07:54 -0700
commitccf23537eeacfa47e5f18dd3b75089886d177c1b (patch)
treecadcde5aa295377ca4613fde651a20e2e8bb7a26 /init/keychords.cpp
parentec16825cb8130420dbdd0ca7086f5f1c7ad469a8 (diff)
downloadcore-ccf23537eeacfa47e5f18dd3b75089886d177c1b.tar.gz
core-ccf23537eeacfa47e5f18dd3b75089886d177c1b.tar.bz2
core-ccf23537eeacfa47e5f18dd3b75089886d177c1b.zip
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
Diffstat (limited to 'init/keychords.cpp')
-rw-r--r--init/keychords.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/init/keychords.cpp b/init/keychords.cpp
index 3dbb2f0d0..5801ea88f 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 @@ static void handle_keychord() {
}
// 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) {