diff options
| author | David Anderson <dvander@google.com> | 2019-09-10 02:38:14 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-10 02:38:14 +0200 |
| commit | c0e2ac8e5d8a150b95a3c8928a77582eba1b2141 (patch) | |
| tree | f1fa2093391b32943f7b8127edee889d60d0f916 | |
| parent | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master (diff) | |
| parent | Merge "Improve error messaging when bootcontrol HAL fails to load." (diff) | |
| download | android_bootable_recovery-c0e2ac8e5d8a150b95a3c8928a77582eba1b2141.tar android_bootable_recovery-c0e2ac8e5d8a150b95a3c8928a77582eba1b2141.tar.gz android_bootable_recovery-c0e2ac8e5d8a150b95a3c8928a77582eba1b2141.tar.bz2 android_bootable_recovery-c0e2ac8e5d8a150b95a3c8928a77582eba1b2141.tar.lz android_bootable_recovery-c0e2ac8e5d8a150b95a3c8928a77582eba1b2141.tar.xz android_bootable_recovery-c0e2ac8e5d8a150b95a3c8928a77582eba1b2141.tar.zst android_bootable_recovery-c0e2ac8e5d8a150b95a3c8928a77582eba1b2141.zip | |
| -rw-r--r-- | boot_control/libboot_control.cpp | 10 |
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()); |