Merge "boot_control: Don't allow current_slot_ to be -1."

This commit is contained in:
David Anderson 2019-09-05 20:21:47 +00:00 committed by Gerrit Code Review
commit 9c0f102828

View file

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