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

Commit 8286994c authored by Jared Fuchs's avatar Jared Fuchs Committed by Android (Google) Code Review
Browse files

Merge "Add /vendor/odm/overlay to framework RRO allowlist" into main

parents 6280ac14 7488d59c

core/jni/fd_utils.cpp

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ bool FileDescriptorAllowlist::IsAllowed(const std::string& path) const { 
    // See AssetManager.cpp for more details on overlay-subdir.

    static const char* kOverlayDir = "/system/vendor/overlay/";

    static const char* kVendorOverlayDir = "/vendor/overlay";

    static const char* kVendorOdmOverlayDir = "/vendor/odm/overlay";

    static const char* kVendorOverlaySubdir = "/system/vendor/overlay-subdir/";

    static const char* kSystemProductOverlayDir = "/system/product/overlay/";

    static const char* kProductOverlayDir = "/product/overlay";
@@ -129,6 +130,7 @@ bool FileDescriptorAllowlist::IsAllowed(const std::string& path) const { 


    if ((android::base::StartsWith(path, kOverlayDir) ||

         android::base::StartsWith(path, kVendorOverlaySubdir) ||

         android::base::StartsWith(path, kVendorOdmOverlayDir) ||

         android::base::StartsWith(path, kVendorOverlayDir) ||

         android::base::StartsWith(path, kSystemProductOverlayDir) ||

         android::base::StartsWith(path, kProductOverlayDir) ||