Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: Ib52cb91e4f13836cf51d32374cd77774f77da0c8
diff --git a/boot_control.cpp b/boot_control.cpp
index 947e0d5..e8a6421 100644
--- a/boot_control.cpp
+++ b/boot_control.cpp
@@ -562,7 +562,10 @@
for (map_iter = ptn_map.begin(); map_iter != ptn_map.end(); map_iter++){
if (map_iter->second.size() < 1)
continue;
- boot_ctl_set_active_slot_for_partitions(map_iter->second, slot);
+ if (boot_ctl_set_active_slot_for_partitions(map_iter->second, slot)) {
+ ALOGE("%s: Failed to set active slot for partitions ", __func__);;
+ goto error;
+ }
}
if (is_ufs) {
if (!strncmp(slot_suffix_arr[slot], AB_SLOT_A_SUFFIX,
