summaryrefslogtreecommitdiff
path: root/init/builtins.cpp
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2019-07-16 13:15:48 +0200
committerVinay Verma <vvinay@codeaurora.org>2019-07-22 15:32:03 +0530
commit70d2882dbb185e1726473c0357b058a733c6a37a (patch)
treeab90765bb50ba8005b2969717128f9514ff2cc1c /init/builtins.cpp
parentcec5f2a73ba083481c05d8177c05928b6ed64258 (diff)
Ignore class_{reset|start}_post_data on non-updatable APEX.
For devices that use FDE and don't support updatable APEXes, don't stop and restart all processes - there is no need and it only increases boot time for these devices. Additionally, some daemons have never been restarted in the past, and restarting them exposes certain issues. Bug: 137251597 Bug: 136777273 Bug: 135627804 Test: verified manually w/ ro.updatable.apex=false CRs-Fixed: 2485762 Change-Id: I9590f2c2cdfab0a49f39846896460305d44221ee (cherry picked from commit 728586f5b23d830b1d14c61abcf85cd72dc95412)
Diffstat (limited to 'init/builtins.cpp')
-rw-r--r--init/builtins.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 030a99692..ce2c0ace6 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -41,6 +41,7 @@
#include <sys/wait.h>
#include <unistd.h>
+#include <ApexProperties.sysprop.h>
#include <android-base/chrono_utils.h>
#include <android-base/file.h>
#include <android-base/logging.h>
@@ -125,6 +126,13 @@ static Result<Success> do_class_start_post_data(const BuiltinArguments& args) {
if (args.context != kInitContext) {
return Error() << "command 'class_start_post_data' only available in init context";
}
+ static bool is_apex_updatable = android::sysprop::ApexProperties::updatable().value_or(false);
+
+ if (!is_apex_updatable) {
+ // No need to start these on devices that don't support APEX, since they're not
+ // stopped either.
+ return {};
+ }
for (const auto& service : ServiceList::GetInstance()) {
if (service->classnames().count(args[1])) {
if (auto result = service->StartIfPostData(); !result) {
@@ -150,6 +158,11 @@ static Result<Success> do_class_reset_post_data(const BuiltinArguments& args) {
if (args.context != kInitContext) {
return Error() << "command 'class_reset_post_data' only available in init context";
}
+ static bool is_apex_updatable = android::sysprop::ApexProperties::updatable().value_or(false);
+ if (!is_apex_updatable) {
+ // No need to stop these on devices that don't support APEX.
+ return {};
+ }
ForEachServiceInClass(args[1], &Service::ResetIfPostData);
return Success();
}