diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-03-28 16:40:41 -0700 |
|---|---|---|
| committer | Keun-young Park <keunyoung@google.com> | 2017-03-29 10:07:54 -0700 |
| commit | 7236472997da64dfe2384b68178dc085b08a332b (patch) | |
| tree | cadcde5aa295377ca4613fde651a20e2e8bb7a26 /init/builtins.cpp | |
| parent | 92eb93cd7b7e52c695f96c83d8f216158ab5b301 (diff) | |
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/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index ec55b03d54..5a67e5e1ef 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -45,15 +45,16 @@ #include <selinux/selinux.h> #include <selinux/label.h> -#include <fs_mgr.h> #include <android-base/file.h> #include <android-base/parseint.h> -#include <android-base/strings.h> +#include <android-base/properties.h> #include <android-base/stringprintf.h> +#include <android-base/strings.h> #include <bootloader_message/bootloader_message.h> #include <cutils/android_reboot.h> #include <ext4_utils/ext4_crypt.h> #include <ext4_utils/ext4_crypt_init_extensions.h> +#include <fs_mgr.h> #include <logwrap/logwrap.h> #include "action.h" @@ -879,8 +880,7 @@ static int do_installkeys_ensure_dir_exists(const char* dir) { } static bool is_file_crypto() { - std::string value = property_get("ro.crypto.type"); - return value == "file"; + return android::base::GetProperty("ro.crypto.type", "") == "file"; } static int do_installkey(const std::vector<std::string>& args) { |