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

Commit 9258f2e4 authored by Yifan Hong's avatar Yifan Hong
Browse files

Load sysprops from odm_dlkm. 

Load sysprops from /odm_dlkm/etc/build.prop. Note that no
property contexts are loaded from odm_dlkm.

Test: getprop | grep odm_dlkm
Bug: 156020364
Change-Id: I90c3a54a110462736d9888101d4281100d586632
parent 7c95de75

init/property_service.cpp

+3 −1
Original line number Diff line number Diff line
@@ -632,10 +632,11 @@ static void LoadProperties(char* data, const char* filter, const char* filename, 
    char *key, *value, *eol, *sol, *tmp, *fn;

    size_t flen = 0;



    static constexpr const char* const kVendorPathPrefixes[3] = {

    static constexpr const char* const kVendorPathPrefixes[4] = {

            "/vendor",

            "/odm",

            "/vendor_dlkm",

            "/odm_dlkm",

    };



    const char* context = kInitContext;
@@ -941,6 +942,7 @@ void PropertyLoadBootDefaults() { 
    // }

    load_properties_from_file("/vendor/build.prop", nullptr, &properties);

    load_properties_from_file("/vendor_dlkm/etc/build.prop", nullptr, &properties);

    load_properties_from_file("/odm_dlkm/etc/build.prop", nullptr, &properties);

    load_properties_from_partition("odm", /* support_legacy_path_until */ 28);

    load_properties_from_partition("product", /* support_legacy_path_until */ 30);