commit 30650d6d57a0878c1d1972320179864a714d49b4
author Dennis Shen <dzshen@google.com> Wed Dec 04 15:57:02 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 04 15:57:02 2024 +0000
tree 56fe6219c89e97618a50f8e3f929616083a7f0f1
parent 4f6c94845f78e8586623a4f8ae37a8affc57c890
parent 894577050bf0b5cc6a9048ddb02e3477e1e6ee00

Merge "Start aconfigd socket defined in configinfra mainline module" into main am: 894577050b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3284475

Change-Id: I6180d86db5c2ed8bba8664f741d00df08ebfcf0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index e487797..ae6a658 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -1004,6 +1004,11 @@
     exec_start system_aconfigd_mainline_init
     start system_aconfigd_socket_service
 
+    # start mainline aconfigd init, after transition, the above system_aconfigd_mainline_init
+    # will be deprecated
+    exec_start mainline_aconfigd_init
+    start mainline_aconfigd_socket_service
+
     # Create directories for boot animation.
     mkdir /data/misc/bootanim 0755 system system