Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfb324fe authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "fs_mgr: avb check avb_slot_data" am: 72c06c5f 

am: 238dc3b5

Change-Id: I4f985f7a7139b70afa594aa0248190cc533bbd2d
parents b673e6a5 238dc3b5

fs_mgr/libfs_avb/avb_ops.cpp

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ AvbSlotVerifyResult FsManagerAvbOps::AvbSlotVerify(const std::string& ab_suffix, 
            avb_slot_verify(&avb_ops_, requested_partitions, ab_suffix.c_str(), flags,

                            AVB_HASHTREE_ERROR_MODE_RESTART_AND_INVALIDATE, &avb_slot_data);



    if (!avb_slot_data) return verify_result;

    // Copies avb_slot_data->vbmeta_images[].

    for (size_t i = 0; i < avb_slot_data->num_vbmeta_images; i++) {

        out_vbmeta_images->emplace_back(VBMetaData(avb_slot_data->vbmeta_images[i].vbmeta_data,