diff options
| author | Treehugger Robot <android-build-prod@system.gserviceaccount.com> | 2018-07-20 04:07:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-20 04:07:26 +0000 |
| commit | 5ec25d8cf4e37df90d5b5eb96310d706768c5125 (patch) | |
| tree | e0b2bbcda7ec9076a9970a538fb7b7ecf04e93b1 | |
| parent | f14813368cfa5d23eb3eb022377ded718d33fcd4 (diff) | |
| parent | e40d7692fc0dad1f09c88377f5b8c0ebc3ce5c61 (diff) | |
Merge "Fix loading ueventd.${ro.hardware}.rc." into p-keystone-qcom
| -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), |