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." am: 4878f6a31c am: 1074b8a539

Browse Source 
am: c0e2ac8e5d

Change-Id: Ic66b6370515a7aed2f26bdacf64859668d230e37
This commit is contained in:
David Anderson
2019-09-09 17:50:39 -07:00
committed by android-build-merger
parent 4ec16abf82 c0e2ac8e5d
commit 1f1f3b0a59
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
boot_control/libboot_control.cpp
View File

@@ -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());