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

Commit 7a3b317f authored by Sandeep Patil's avatar Sandeep Patil Committed by android-build-merger
Browse files

Merge "ueventd: source ueventd configs from vendor and odm" am: d54d4c27 am: 48b32bf3 

am: 7d045980

Change-Id: I948e1139e439597d65dfc409033d0ab5bab0015a
parents f34b03a9 7d045980

init/ueventd.cpp

+11 −2
Original line number Diff line number Diff line
@@ -60,9 +60,18 @@ int ueventd_main(int argc, char **argv) 
    cb.func_log = selinux_klog_callback;

    selinux_set_callback(SELINUX_CB_LOG, cb);



    std::string hardware = property_get("ro.hardware");



    ueventd_parse_config_file("/ueventd.rc");

    ueventd_parse_config_file("/vendor/ueventd.rc");

    ueventd_parse_config_file("/odm/ueventd.rc");



    /*

     * keep the current product name base configuration so

     * we remain backwards compatible and allow it to override

     * everything

     * TODO: cleanup platform ueventd.rc to remove vendor specific

     * device node entries (b/34968103)

     */

    std::string hardware = property_get("ro.hardware");

    ueventd_parse_config_file(android::base::StringPrintf("/ueventd.%s.rc", hardware.c_str()).c_str());



    device_init();