diff options
| author | David Anderson <dvander@google.com> | 2019-09-06 01:59:02 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-06 01:59:02 +0200 |
| commit | 569f587afd4307e4f0e265bbaf7aebcab306c4cb (patch) | |
| tree | c4879e401b03d09c14d147d5fddd985e8dbfbc0e | |
| parent | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e0364db712 -s ours (diff) | |
| parent | Merge "boot_control: Don't allow current_slot_ to be -1." am: 9c0f102828 (diff) | |
| download | android_bootable_recovery-569f587afd4307e4f0e265bbaf7aebcab306c4cb.tar android_bootable_recovery-569f587afd4307e4f0e265bbaf7aebcab306c4cb.tar.gz android_bootable_recovery-569f587afd4307e4f0e265bbaf7aebcab306c4cb.tar.bz2 android_bootable_recovery-569f587afd4307e4f0e265bbaf7aebcab306c4cb.tar.lz android_bootable_recovery-569f587afd4307e4f0e265bbaf7aebcab306c4cb.tar.xz android_bootable_recovery-569f587afd4307e4f0e265bbaf7aebcab306c4cb.tar.zst android_bootable_recovery-569f587afd4307e4f0e265bbaf7aebcab306c4cb.zip | |
| -rw-r--r-- | boot_control/libboot_control.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/boot_control/libboot_control.cpp b/boot_control/libboot_control.cpp index 8b44d5d1c..fa7dc47ef 100644 --- a/boot_control/libboot_control.cpp +++ b/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; |