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

Commit 4b859e41 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "fs_mgr: remove same partition check for vbmeta" am: 877e074e am: 8f901efb 

am: 66ec0903

Change-Id: I7de175f210b5eed5aa1ca5bb31aee5af2cf36c46
parents 26db9e9e 66ec0903

fs_mgr/fs_mgr_avb.cpp

+0 −11
Original line number Diff line number Diff line
@@ -322,17 +322,6 @@ static bool get_hashtree_descriptor(const std::string& partition_name, 
            continue;

        }



        // Ensures that hashtree descriptor is in /vbmeta or /boot or in

        // the same partition for verity setup.

        std::string vbmeta_partition_name(verify_data.vbmeta_images[i].partition_name);

        if (vbmeta_partition_name != "vbmeta" &&

            vbmeta_partition_name != "boot" &&  // for legacy device to append top-level vbmeta

            vbmeta_partition_name != partition_name) {

            LWARNING << "Skip vbmeta image at " << verify_data.vbmeta_images[i].partition_name

                     << " for partition: " << partition_name.c_str();

            continue;

        }



        for (size_t j = 0; j < num_descriptors && !found; j++) {

            AvbDescriptor desc;

            if (!avb_descriptor_validate_and_byteswap(descriptors[j], &desc)) {