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

Commit 5856b695 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7533212 from 91ef4dac to sc-d1-release 

Change-Id: I99842eb94adc3f1efdf8b25c6a13fe3ce8955055
parents d2c1e860 91ef4dac

init/mount_namespace.cpp

+2 −1
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ static bool ActivateFlattenedApexesIfPossible() { 
    auto on_activate = [&](const std::string& apex_path,

                           const apex::proto::ApexManifest& apex_manifest) {

        apex_infos.emplace_back(apex_manifest.name(), apex_path, apex_path, apex_manifest.version(),

                                apex_manifest.versionname(), /*isFactory=*/true, /*isActive=*/true);

                                apex_manifest.versionname(), /*isFactory=*/true, /*isActive=*/true,

                                /* lastUpdateMillis= */ 0);

    };



    for (const auto& dir : kBuiltinDirsForApexes) {

init/util.cpp

+4 −2
Original line number Diff line number Diff line
@@ -253,8 +253,10 @@ void ImportBootconfig(const std::function<void(const std::string&, const std::st 
    for (const auto& entry : android::base::Split(bootconfig, "\n")) {

        std::vector<std::string> pieces = android::base::Split(entry, "=");

        if (pieces.size() == 2) {

            pieces[1].erase(std::remove(pieces[1].begin(), pieces[1].end(), '"'), pieces[1].end());

            fn(android::base::Trim(pieces[0]), android::base::Trim(pieces[1]));

            // get rid of the extra space between a list of values and remove the quotes.

            std::string value = android::base::StringReplace(pieces[1], "\", \"", ",", true);

            value.erase(std::remove(value.begin(), value.end(), '"'), value.end());

            fn(android::base::Trim(pieces[0]), android::base::Trim(value));

        }

    }

}

trusty/keymaster/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ cc_binary { 
        "ipc/trusty_keymaster_ipc.cpp",

        "keymint/TrustyKeyMintDevice.cpp",

        "keymint/TrustyKeyMintOperation.cpp",

        "keymint/TrustyRemotelyProvisionedComponentDevice.cpp",

        "keymint/TrustySecureClock.cpp",

        "keymint/TrustySharedSecret.cpp",

        "keymint/service.cpp",
@@ -118,7 +119,6 @@ cc_binary { 
        "libtrusty",

    ],

    required: [

        "RemoteProvisioner",

        "android.hardware.hardware_keystore.xml",

    ],

}

trusty/keymaster/TrustyKeymaster.cpp

+10 −0
Original line number Diff line number Diff line
@@ -158,6 +158,16 @@ void TrustyKeymaster::GenerateKey(const GenerateKeyRequest& request, 
    }

}



void TrustyKeymaster::GenerateRkpKey(const GenerateRkpKeyRequest& request,

                                     GenerateRkpKeyResponse* response) {

    ForwardCommand(KM_GENERATE_RKP_KEY, request, response);

}



void TrustyKeymaster::GenerateCsr(const GenerateCsrRequest& request,

                                  GenerateCsrResponse* response) {

    ForwardCommand(KM_GENERATE_CSR, request, response);

}



void TrustyKeymaster::GetKeyCharacteristics(const GetKeyCharacteristicsRequest& request,

                                            GetKeyCharacteristicsResponse* response) {

    ForwardCommand(KM_GET_KEY_CHARACTERISTICS, request, response);

trusty/keymaster/include/trusty_keymaster/TrustyKeymaster.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ class TrustyKeymaster { 
    void AddRngEntropy(const AddEntropyRequest& request, AddEntropyResponse* response);

    void Configure(const ConfigureRequest& request, ConfigureResponse* response);

    void GenerateKey(const GenerateKeyRequest& request, GenerateKeyResponse* response);

    void GenerateRkpKey(const GenerateRkpKeyRequest& request, GenerateRkpKeyResponse* response);

    void GenerateCsr(const GenerateCsrRequest& request, GenerateCsrResponse* response);

    void GetKeyCharacteristics(const GetKeyCharacteristicsRequest& request,

                               GetKeyCharacteristicsResponse* response);

    void ImportKey(const ImportKeyRequest& request, ImportKeyResponse* response);