Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1074b8a5 authored by David Anderson's avatar David Anderson Committed by android-build-merger
Browse files

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

am: 4878f6a3

Change-Id: Ic9b5bacec378bd497d6d488b98dd1b224aa6e166
parents b3b43be5 4878f6a3

boot_control/libboot_control.cpp

+8 −2
Original line number Diff line number Diff line
@@ -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());