Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 am: 0c34ef807b am: 185013413e am: 569f587afd

am: 093a8cb364

Change-Id: Ib1106dbcbd3db8d763e6938264b486081e0d80c9

boot_control/libboot_control.cpp

@@ -196,6 +196,10 @@ bool BootControl::Init() {
   // was not set (from either the command line or the device tree), we can later
   // initialize it from the bootloader_control struct.
   std::string suffix_prop = android::base::GetProperty("ro.boot.slot_suffix", "");
+  if (suffix_prop.empty()) {
+    LOG(ERROR) << "Slot suffix property is not set";
+    return false;
+  }
   current_slot_ = SlotSuffixToIndex(suffix_prop.c_str());
 
   std::string err;