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

Commit 2c57f71c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add ctl.apex_(un)load properties to (un)load apex" am: e271146e am: e03286ac 

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



Change-Id: I36ae09a9f507295f443e74037c2ebc8ef70776f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75aab429 e03286ac

init/init.cpp

+32 −1
Original line number Diff line number Diff line
@@ -445,6 +445,19 @@ static Result<void> DoControlRestart(Service* service) { 
    return {};

}



static void DoUnloadApex(const std::string& apex_name) {

    std::string prop_name = "init.apex." + apex_name;

    // TODO(b/232114573) remove services and actions read from the apex

    // TODO(b/232799709) kill services from the apex

    SetProperty(prop_name, "unloaded");

}



static void DoLoadApex(const std::string& apex_name) {

    std::string prop_name = "init.apex." + apex_name;

    // TODO(b/232799709) read .rc files from the apex

    SetProperty(prop_name, "loaded");

}



enum class ControlTarget {

    SERVICE,    // function gets called for the named service

    INTERFACE,  // action gets called for every service that holds this interface
@@ -468,6 +481,20 @@ static const std::map<std::string, ControlMessageFunction, std::less<>>& GetCont 
    return control_message_functions;

}



static bool HandleApexControlMessage(std::string_view action, const std::string& name,

                                     std::string_view message) {

    if (action == "load") {

        DoLoadApex(name);

        return true;

    } else if (action == "unload") {

        DoUnloadApex(name);

        return true;

    } else {

        LOG(ERROR) << "Unknown control msg '" << message << "'";

        return false;

    }

}



static bool HandleControlMessage(std::string_view message, const std::string& name,

                                 pid_t from_pid) {

    std::string cmdline_path = StringPrintf("proc/%d/cmdline", from_pid);
@@ -479,8 +506,12 @@ static bool HandleControlMessage(std::string_view message, const std::string& na 
        process_cmdline = "unknown process";

    }



    Service* service = nullptr;

    auto action = message;

    if (ConsumePrefix(&action, "apex_")) {

        return HandleApexControlMessage(action, name, message);

    }



    Service* service = nullptr;

    if (ConsumePrefix(&action, "interface_")) {

        service = ServiceList::GetInstance().FindInterface(name);

    } else {

init/init_test.cpp

+18 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ 
#include "util.h"



using android::base::GetIntProperty;

using android::base::GetProperty;

using android::base::SetProperty;

using android::base::WaitForProperty;

using namespace std::literals;



namespace android {

namespace init {
@@ -334,6 +338,20 @@ TEST(init, LazilyLoadedActionsCanBeTriggeredByTheNextTrigger) { 
    EXPECT_EQ(2, num_executed);

}



TEST(init, RespondToCtlApexMessages) {

    if (getuid() != 0) {

        GTEST_SKIP() << "Skipping test, must be run as root.";

        return;

    }



    std::string apex_name = "com.android.apex.cts.shim";

    SetProperty("ctl.apex_unload", apex_name);

    EXPECT_TRUE(WaitForProperty("init.apex." + apex_name, "unloaded", 10s));



    SetProperty("ctl.apex_load", apex_name);

    EXPECT_TRUE(WaitForProperty("init.apex." + apex_name, "loaded", 10s));

}



TEST(init, RejectsCriticalAndOneshotService) {

    if (GetIntProperty("ro.product.first_api_level", 10000) < 30) {

        GTEST_SKIP() << "Test only valid for devices launching with R or later";