summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2019-09-10 02:27:11 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-09-10 02:27:11 +0200
commit1074b8a53947b4860bf6cce3c2de4e8190c8fa3e (patch)
treef1fa2093391b32943f7b8127edee889d60d0f916
parentMerge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master (diff)
parentMerge "Improve error messaging when bootcontrol HAL fails to load." (diff)
downloadandroid_bootable_recovery-1074b8a53947b4860bf6cce3c2de4e8190c8fa3e.tar
android_bootable_recovery-1074b8a53947b4860bf6cce3c2de4e8190c8fa3e.tar.gz
android_bootable_recovery-1074b8a53947b4860bf6cce3c2de4e8190c8fa3e.tar.bz2
android_bootable_recovery-1074b8a53947b4860bf6cce3c2de4e8190c8fa3e.tar.lz
android_bootable_recovery-1074b8a53947b4860bf6cce3c2de4e8190c8fa3e.tar.xz
android_bootable_recovery-1074b8a53947b4860bf6cce3c2de4e8190c8fa3e.tar.zst
android_bootable_recovery-1074b8a53947b4860bf6cce3c2de4e8190c8fa3e.zip
-rw-r--r--boot_control/libboot_control.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/boot_control/libboot_control.cpp b/boot_control/libboot_control.cpp
index fa7dc47ef..89cf8786a 100644
--- a/boot_control/libboot_control.cpp
+++ b/boot_control/libboot_control.cpp
@@ -204,10 +204,16 @@ bool BootControl::Init() {
std::string err;
std::string device = get_bootloader_message_blk_device(&err);
- if (device.empty()) return false;
+ if (device.empty()) {
+ LOG(ERROR) << "Could not find bootloader message block device: " << err;
+ return false;
+ }
bootloader_control boot_ctrl;
- if (!LoadBootloaderControl(device.c_str(), &boot_ctrl)) return false;
+ if (!LoadBootloaderControl(device.c_str(), &boot_ctrl)) {
+ LOG(ERROR) << "Failed to load bootloader control block";
+ return false;
+ }
// Note that since there isn't a module unload function this memory is leaked.
misc_device_ = strdup(device.c_str());