ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: move MarkServicesUpdate later" into main am: e90d93ab6e

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

Change-Id: I55371baa91b3963fcc655121bc281fff8972de81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han 2023-07-31 22:24:30 +00:00 • committed by Automerger Merge Worker
commit ae91cd0dd6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/builtins.cpp
View file

@ -1297,7 +1297,6 @@ static Result<void> do_perform_apex_config(const BuiltinArguments& args) {
return create_dirs.error(); return create_dirs.error();
} }
auto parse_configs = ParseApexConfigs(/*apex_name=*/""); auto parse_configs = ParseApexConfigs(/*apex_name=*/"");
ServiceList::GetInstance().MarkServicesUpdate();
if (!parse_configs.ok()) { if (!parse_configs.ok()) {
return parse_configs.error(); return parse_configs.error();
} }
@ -1307,6 +1306,8 @@ static Result<void> do_perform_apex_config(const BuiltinArguments& args) {
return update_linker_config.error(); return update_linker_config.error();
} }
// Now start delayed services
ServiceList::GetInstance().MarkServicesUpdate();
return {}; return {};
} }