summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSen Jiang2018-07-18 19:27:24 -0500
committerSen Jiang2018-07-18 20:10:36 -0500
commitd76f174a785d2f1c17999a2d23b1fea2a33e4b1e (patch)
tree87ae3bfaca3ab6e949c14a5b34fe3b972439dcc6
parent54f40303d5632e7f5852cd9f467454281c4f979a (diff)
downloadplatform-system-core-d76f174a785d2f1c17999a2d23b1fea2a33e4b1e.tar.gz
platform-system-core-d76f174a785d2f1c17999a2d23b1fea2a33e4b1e.tar.xz
platform-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.cpp3
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) {
240 auto hardware = android::base::GetProperty("ro.hardware", ""); 240 auto hardware = android::base::GetProperty("ro.hardware", "");
241 241
242 auto ueventd_configuration = 242 auto ueventd_configuration =
243 ParseConfig({"/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc", hardware}); 243 ParseConfig({"/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc",
244 "/ueventd." + hardware + ".rc"});
244 245
245 device_handler = DeviceHandler{std::move(ueventd_configuration.dev_permissions), 246 device_handler = DeviceHandler{std::move(ueventd_configuration.dev_permissions),
246 std::move(ueventd_configuration.sysfs_permissions), 247 std::move(ueventd_configuration.sysfs_permissions),