commit c0e2ac8e5d8a150b95a3c8928a77582eba1b2141
author David Anderson <dvander@google.com> Mon Sep 09 17:38:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 09 17:38:14 2019 -0700
tree f1fa2093391b32943f7b8127edee889d60d0f916
parent 4b1e75118158297c50f720e31ffabf8e4909eec4
parent 1074b8a53947b4860bf6cce3c2de4e8190c8fa3e

Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c
am: 1074b8a539

Change-Id: I6438198585e750b796d4cbc5c0e05940cbd90e40

boot_control/libboot_control.cpp

diff --git a/boot_control/libboot_control.cpp b/boot_control/libboot_control.cpp
index fa7dc47..89cf878 100644
--- a/boot_control/libboot_control.cpp
+++ b/boot_control/libboot_control.cpp
@@ -204,10 +204,16 @@
 
   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());