| Jon West | ac1d79e | 2019-04-16 20:29:14 -0400 | [diff] [blame] | 1 | From 10c6df7c3d1fb97c8945ddb49afbfb2ebb3fe7ca Mon Sep 17 00:00:00 2001 |
| 2 | From: Sen Jiang <senj@google.com> |
| 3 | Date: Wed, 18 Jul 2018 17:27:24 -0700 |
| 4 | Subject: [PATCH 7/7] Fix loading ueventd.${ro.hardware}.rc. |
| 5 | |
| 6 | Regression introduced in aosp/717324. |
| 7 | |
| 8 | Bug: 111543389 |
| 9 | Test: device boots further |
| 10 | Change-Id: I4cf57381104aa1a801cf82a42b1c5ae1a2273e89 |
| 11 | Merged-In: I4cf57381104aa1a801cf82a42b1c5ae1a2273e89 |
| 12 | (cherry picked from commit d76f174a785d2f1c17999a2d23b1fea2a33e4b1e) |
| 13 | --- |
| 14 | init/ueventd.cpp | 3 ++- |
| 15 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/init/ueventd.cpp b/init/ueventd.cpp |
| 18 | index 680944546..b42a4c62a 100644 |
| 19 | --- a/init/ueventd.cpp |
| 20 | +++ b/init/ueventd.cpp |
| 21 | @@ -240,7 +240,8 @@ int ueventd_main(int argc, char** argv) { |
| 22 | auto hardware = android::base::GetProperty("ro.hardware", ""); |
| 23 | |
| 24 | auto ueventd_configuration = |
| 25 | - ParseConfig({"/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc", hardware}); |
| 26 | + ParseConfig({"/ueventd.rc", "/vendor/ueventd.rc", "/odm/ueventd.rc", |
| 27 | + "/ueventd." + hardware + ".rc"}); |
| 28 | |
| 29 | device_handler = DeviceHandler{std::move(ueventd_configuration.dev_permissions), |
| 30 | std::move(ueventd_configuration.sysfs_permissions), |
| 31 | -- |
| 32 | 2.17.1 |
| 33 | |