diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:51:06 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:51:06 -0700 |
| commit | 8a744d061bc9e347c62d4bae4c9a5804ee5583b3 (patch) | |
| tree | 61942ca22e03e502cf97b3196f8366efbcf20c1d | |
| parent | bb80b0f386d7babd8db5ede168ecf74c1a9a9a4f (diff) | |
| parent | d7712830512c55bf591e4295af69559d3681b22d (diff) | |
| download | platform_hardware_qcom_bootctrl-master-cuttlefish-testing-release.tar.gz platform_hardware_qcom_bootctrl-master-cuttlefish-testing-release.tar.bz2 platform_hardware_qcom_bootctrl-master-cuttlefish-testing-release.zip | |
Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
Bug: 112104996
Change-Id: I529185d80380b948297d3c367cce30b7dec8de54
| -rw-r--r-- | boot_control.cpp | 5 |
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, |