Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db41c101 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by android-build-merger
Browse files

Update logic for detecting pre-apexd services to check that the ART APEX is... 

Update logic for detecting pre-apexd services to check that the ART APEX is mounted. am: cacf0435 am: 4c063099 am: 47740079
am: c1f8fbd5

Change-Id: I4e225e196d122ce36ad3b5adbb4c54b2bae651b3
parents 480468db c1f8fbd5

init/service.cpp

+8 −7
Original line number Diff line number Diff line
@@ -116,9 +116,10 @@ static bool ExpandArgsAndExecv(const std::vector<std::string>& args, bool sigsto 
    return execv(c_strings[0], c_strings.data()) == 0;

}



static bool IsRuntimeApexReady() {

static bool AreRuntimeApexesReady() {

    struct stat buf;

    return stat("/apex/com.android.runtime/", &buf) == 0;

    return stat("/apex/com.android.art/", &buf) == 0 &&

           stat("/apex/com.android.runtime/", &buf) == 0;

}



unsigned long Service::next_start_order_ = 1;
@@ -406,11 +407,11 @@ Result<void> Service::Start() { 
        scon = *result;

    }



    if (!IsRuntimeApexReady() && !pre_apexd_) {

        // If this service is started before the runtime APEX gets available,

        // mark it as pre-apexd one. Note that this marking is permanent. So

        // for example, if the service is re-launched (e.g., due to crash),

        // it is still recognized as pre-apexd... for consistency.

    if (!AreRuntimeApexesReady() && !pre_apexd_) {

        // If this service is started before the Runtime and ART APEXes get

        // available, mark it as pre-apexd one. Note that this marking is

        // permanent. So for example, if the service is re-launched (e.g., due

        // to crash), it is still recognized as pre-apexd... for consistency.

        pre_apexd_ = true;

    }