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

Commit d334d69b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Load default prop from /system/etc/prop.default" into oc-dr1-dev

parents ad692c9b 527d80d9

init/property_service.cpp

+11 −4
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static void handle_property_set_fd() { 
    }

}



static void load_properties_from_file(const char *, const char *);

static bool load_properties_from_file(const char *, const char *);



/*

 * Filter is used to decide which properties to load: NULL loads all keys,
@@ -507,17 +507,18 @@ static void load_properties(char *data, const char *filter) 


// Filter is used to decide which properties to load: NULL loads all keys,

// "ro.foo.*" is a prefix match, and "ro.foo.bar" is an exact match.

static void load_properties_from_file(const char* filename, const char* filter) {

static bool load_properties_from_file(const char* filename, const char* filter) {

    Timer t;

    std::string data;

    std::string err;

    if (!ReadFile(filename, &data, &err)) {

        PLOG(WARNING) << "Couldn't load property file: " << err;

        return;

        return false;

    }

    data.push_back('\n');

    load_properties(&data[0], filter);

    LOG(VERBOSE) << "(Loading properties from " << filename << " took " << t << ".)";

    return true;

}



static void load_persistent_properties() {
@@ -592,7 +593,13 @@ static void update_sys_usb_config() { 
}



void property_load_boot_defaults() {

    if (!load_properties_from_file("/system/etc/prop.default", NULL)) {

        // Try recovery path

        if (!load_properties_from_file("/prop.default", NULL)) {

            // Try legacy path

            load_properties_from_file("/default.prop", NULL);

        }

    }

    load_properties_from_file("/odm/default.prop", NULL);

    load_properties_from_file("/vendor/default.prop", NULL);

libcutils/fs_config.cpp

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ static const struct fs_path_config android_files[] = { 
    { 00640, AID_ROOT,      AID_SHELL,     0, "data/nativetest64/tests.txt" },

    { 00750, AID_ROOT,      AID_SHELL,     0, "data/nativetest/*" },

    { 00750, AID_ROOT,      AID_SHELL,     0, "data/nativetest64/*" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "default.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "default.prop" }, // legacy

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/etc/prop.default" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/default.prop" },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_dir + 1 },