commit 2e2e836a893216668eec458330f7f51de13f5848
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 21 02:03:16 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 21 02:03:16 2023 +0000
tree b817fab3f0ef6328ac6be7f3a49cdf16b46b0888
parent 142f8129ec49a2b25f8c8979ca671a140f83d4b9
parent 52d8fe9b042b737950683b74c8a075ee7cf20d9b

Merge "Use vendor/etc/ueventd.rc on microdroid" into main

init/ueventd.cpp

diff --git a/init/ueventd.cpp b/init/ueventd.cpp
index 586e2cf..3f0d0e9 100644
--- a/init/ueventd.cpp
+++ b/init/ueventd.cpp
@@ -297,6 +297,10 @@
 }
 
 static UeventdConfiguration GetConfiguration() {
+    if (IsMicrodroid()) {
+        return ParseConfig({"/system/etc/ueventd.rc", "/vendor/etc/ueventd.rc"});
+    }
+
     auto hardware = android::base::GetProperty("ro.hardware", "");
 
     struct LegacyPathInfo {