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

Commit fffaf42a authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "Fix loading ueventd.${ro.hardware}.rc." am: 1fefb9f1 

am: e98e1f55

Change-Id: Ia847169133e76da8808bd871d9e7df34c66c4888
parents c5a3e4ec e98e1f55

init/ueventd.cpp

+2 −1
Original line number Diff line number Diff line
@@ -240,7 +240,8 @@ int ueventd_main(int argc, char** argv) { 
        auto hardware = android::base::GetProperty("ro.hardware", "");



        auto ueventd_configuration =

                ParseConfig({"/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc", hardware});

                ParseConfig({"/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc",

                             "/ueventd." + hardware + ".rc"});



        device_handler = DeviceHandler{std::move(ueventd_configuration.dev_permissions),

                                       std::move(ueventd_configuration.sysfs_permissions),