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

Commit d76f174a authored by Sen Jiang's avatar Sen Jiang
Browse files

Fix loading ueventd.${ro.hardware}.rc. 

Regression introduced in aosp/717324.

Bug: 111543389
Test: device boots further
Change-Id: I4cf57381104aa1a801cf82a42b1c5ae1a2273e89
parent 54f40303

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),