summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Lugo <flugo@google.com>2018-04-12 16:56:34 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-12 16:56:34 -0700
commit88eca68ff7d6bc980ee91e621b5832ac3d75b88f (patch)
tree61942ca22e03e502cf97b3196f8366efbcf20c1d
parentea07592c30a87d555049d70807b09f9b7151cf2e (diff)
parentf6877997980a1a594d495457cee2dac91f6a5534 (diff)
downloadandroid_hardware_qcom_bootctrl-88eca68ff7d6bc980ee91e621b5832ac3d75b88f.tar.gz
android_hardware_qcom_bootctrl-88eca68ff7d6bc980ee91e621b5832ac3d75b88f.tar.bz2
android_hardware_qcom_bootctrl-88eca68ff7d6bc980ee91e621b5832ac3d75b88f.zip
bootcontrol: return error if set active for partitions fails
am: f687799798 Change-Id: Ib90eb3e2f4b955968a4bb216d770c63f4ecb1c05
-rw-r--r--boot_control.cpp5
1 files changed, 4 insertions, 1 deletions
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 @@ int set_active_boot_slot(struct boot_control_module *module, unsigned slot)
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,