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

This commit is contained in:
Tom Cherry 2018-07-19 15:00:08 +00:00 committed by Gerrit Code Review
commit 1fefb9f129
1 changed files with 2 additions and 1 deletions

View File

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