summaryrefslogtreecommitdiffstats
path: root/uncrypt/bootloader_message_writer.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-26 18:51:37 +0200
commitcb22040c6303144a42a90f424f29a267e43bef74 (patch)
tree034b34abded47d933f5e4f84b8f92936fb74bd47 /uncrypt/bootloader_message_writer.cpp
parentMerge "Check corruption when reading uncrypt_status file" (diff)
downloadandroid_bootable_recovery-cb22040c6303144a42a90f424f29a267e43bef74.tar
android_bootable_recovery-cb22040c6303144a42a90f424f29a267e43bef74.tar.gz
android_bootable_recovery-cb22040c6303144a42a90f424f29a267e43bef74.tar.bz2
android_bootable_recovery-cb22040c6303144a42a90f424f29a267e43bef74.tar.lz
android_bootable_recovery-cb22040c6303144a42a90f424f29a267e43bef74.tar.xz
android_bootable_recovery-cb22040c6303144a42a90f424f29a267e43bef74.tar.zst
android_bootable_recovery-cb22040c6303144a42a90f424f29a267e43bef74.zip
Diffstat (limited to 'uncrypt/bootloader_message_writer.cpp')
-rw-r--r--uncrypt/bootloader_message_writer.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/uncrypt/bootloader_message_writer.cpp b/uncrypt/bootloader_message_writer.cpp
index 3bb106aa0..db52121eb 100644
--- a/uncrypt/bootloader_message_writer.cpp
+++ b/uncrypt/bootloader_message_writer.cpp
@@ -17,12 +17,12 @@
#include <errno.h>
#include <fcntl.h>
#include <string.h>
-#include <sys/system_properties.h>
#include <string>
#include <vector>
#include <android-base/file.h>
+#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/unique_fd.h>
#include <fs_mgr.h>
@@ -30,14 +30,13 @@
#include "bootloader.h"
static struct fstab* read_fstab(std::string* err) {
- // The fstab path is always "/fstab.${ro.hardware}".
- std::string fstab_path = "/fstab.";
- char value[PROP_VALUE_MAX];
- if (__system_property_get("ro.hardware", value) == 0) {
+ std::string ro_hardware = android::base::GetProperty("ro.hardware", "");
+ if (ro_hardware.empty()) {
*err = "failed to get ro.hardware";
return nullptr;
}
- fstab_path += value;
+ // The fstab path is always "/fstab.${ro.hardware}".
+ std::string fstab_path = "/fstab." + ro_hardware;
struct fstab* fstab = fs_mgr_read_fstab(fstab_path.c_str());
if (fstab == nullptr) {
*err = "failed to read " + fstab_path;