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

Commit c6bf9d9b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr: avoid std::vector<const T>" into main am: d5c75fd5 am: a26cb937 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3316006



Change-Id: Ie265d50f373776203eb1546066c0a82969623f79
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 766c0e53 a26cb937

fs_mgr/fs_mgr.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2215,11 +2215,11 @@ bool fs_mgr_mount_overlayfs_fstab_entry(const FstabEntry& entry) { 


#if ALLOW_ADBD_DISABLE_VERITY == 0

    // Allowlist the mount point if user build.

    static const std::vector<const std::string> kAllowedPaths = {

    static const std::vector<std::string> kAllowedPaths = {

            "/odm",         "/odm_dlkm",   "/oem",    "/product",

            "/system_dlkm", "/system_ext", "/vendor", "/vendor_dlkm",

    };

    static const std::vector<const std::string> kAllowedPrefixes = {

    static const std::vector<std::string> kAllowedPrefixes = {

            "/mnt/product/",

            "/mnt/vendor/",

    };