PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve error messaging when bootcontrol HAL fails to load."

Browse Source 
am: 4878f6a31c

Change-Id: Ic9b5bacec378bd497d6d488b98dd1b224aa6e166
This commit is contained in:
David Anderson
2019-09-09 17:27:11 -07:00
committed by android-build-merger
parent b3b43be5d8 4878f6a31c
commit 1074b8a539
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot_control/libboot_control.cpp
+8 -2
View File
@@ -204,10 +204,16 @@ bool BootControl::Init() {
std::string err; std::string err;
std::string device = get_bootloader_message_blk_device(&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; 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. // Note that since there isn't a module unload function this memory is leaked.
misc_device_ = strdup(device.c_str()); misc_device_ = strdup(device.c_str());