diff options
| author | Sen Jiang <senj@google.com> | 2018-07-18 17:27:24 -0700 |
|---|---|---|
| committer | Sen Jiang <senj@google.com> | 2018-07-18 18:10:36 -0700 |
| commit | d76f174a785d2f1c17999a2d23b1fea2a33e4b1e (patch) | |
| tree | 87ae3bfaca3ab6e949c14a5b34fe3b972439dcc6 | |
| parent | 54f40303d5632e7f5852cd9f467454281c4f979a (diff) | |
| download | system_core-d76f174a785d2f1c17999a2d23b1fea2a33e4b1e.tar.gz system_core-d76f174a785d2f1c17999a2d23b1fea2a33e4b1e.tar.bz2 system_core-d76f174a785d2f1c17999a2d23b1fea2a33e4b1e.zip | |
Fix loading ueventd.${ro.hardware}.rc.
Regression introduced in aosp/717324.
Bug: 111543389
Test: device boots further
Change-Id: I4cf57381104aa1a801cf82a42b1c5ae1a2273e89
| -rw-r--r-- | init/ueventd.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/ueventd.cpp b/init/ueventd.cpp index 680944546..b42a4c62a 100644 --- a/init/ueventd.cpp +++ b/init/ueventd.cpp @@ -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), |