commit 1fefb9f1294d3e270f1711f41e7c77a61213742b
author Tom Cherry <tomcherry@google.com> Thu Jul 19 15:00:08 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 19 15:00:08 2018 +0000
tree 87ae3bfaca3ab6e949c14a5b34fe3b972439dcc6
parent 54f40303d5632e7f5852cd9f467454281c4f979a
parent d76f174a785d2f1c17999a2d23b1fea2a33e4b1e

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

init/ueventd.cpp

diff --git a/init/ueventd.cpp b/init/ueventd.cpp
index 6809445..b42a4c6 100644
--- a/init/ueventd.cpp
+++ b/init/ueventd.cpp
@@ -240,7 +240,8 @@
         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),