summaryrefslogtreecommitdiffstats
path: root/uncrypt/uncrypt.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-09-24 00:30:55 +0200
committerElliott Hughes <enh@google.com>2016-09-24 03:16:35 +0200
commit91e3aee9bdc1a503affdd925dd4da352a198abca (patch)
tree2fee5fc861058ac011970af564aea79ff8fa97de /uncrypt/uncrypt.cpp
parentRevert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067" (diff)
downloadandroid_bootable_recovery-91e3aee9bdc1a503affdd925dd4da352a198abca.tar
android_bootable_recovery-91e3aee9bdc1a503affdd925dd4da352a198abca.tar.gz
android_bootable_recovery-91e3aee9bdc1a503affdd925dd4da352a198abca.tar.bz2
android_bootable_recovery-91e3aee9bdc1a503affdd925dd4da352a198abca.tar.lz
android_bootable_recovery-91e3aee9bdc1a503affdd925dd4da352a198abca.tar.xz
android_bootable_recovery-91e3aee9bdc1a503affdd925dd4da352a198abca.tar.zst
android_bootable_recovery-91e3aee9bdc1a503affdd925dd4da352a198abca.zip
Diffstat (limited to 'uncrypt/uncrypt.cpp')
-rw-r--r--uncrypt/uncrypt.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 1fba717f3..904ddad1b 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -107,12 +107,12 @@
#include <android-base/file.h>
#include <android-base/logging.h>
+#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
#include <bootloader_message/bootloader_message.h>
#include <cutils/android_reboot.h>
-#include <cutils/properties.h>
#include <cutils/sockets.h>
#include <fs_mgr.h>
@@ -163,13 +163,15 @@ static struct fstab* read_fstab() {
fstab = NULL;
// The fstab path is always "/fstab.${ro.hardware}".
- char fstab_path[PATH_MAX+1] = "/fstab.";
- if (!property_get("ro.hardware", fstab_path+strlen(fstab_path), "")) {
+ std::string ro_hardware = android::base::GetProperty("ro.hardware", "");
+ if (ro_hardware.empty()) {
LOG(ERROR) << "failed to get ro.hardware";
return NULL;
}
- fstab = fs_mgr_read_fstab(fstab_path);
+ std::string fstab_path = "/fstab." + ro_hardware;
+
+ fstab = fs_mgr_read_fstab(fstab_path.c_str());
if (!fstab) {
LOG(ERROR) << "failed to read " << fstab_path;
return NULL;
@@ -194,9 +196,7 @@ static const char* find_block_device(const char* path, bool* encryptable, bool*
*encryptable = false;
if (fs_mgr_is_encryptable(v) || fs_mgr_is_file_encrypted(v)) {
*encryptable = true;
- char buffer[PROPERTY_VALUE_MAX+1];
- if (property_get("ro.crypto.state", buffer, "") &&
- strcmp(buffer, "encrypted") == 0) {
+ if (android::base::GetProperty("ro.crypto.state", "") == "encrypted") {
*encrypted = true;
}
}