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

Commit 72a9fcb0 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7986305 from 4f6748a9 to tm-release 

Change-Id: I095d373b23a621f78ba4ba85341ffea6bf3dfeb0
parents 74eeee8c 4f6748a9

gnss/aidl/vts/gnss_hal_test_cases.cpp

+3 −0
Original line number Diff line number Diff line
@@ -804,6 +804,9 @@ TEST_P(GnssHalTest, TestAllExtensions) { 
 * 3. Sets SUPL server host/port.

 */

TEST_P(GnssHalTest, TestAGnssExtension) {

    if (aidl_gnss_hal_->getInterfaceVersion() == 1) {

        return;

    }

    sp<IAGnss> iAGnss;

    auto status = aidl_gnss_hal_->getExtensionAGnss(&iAGnss);

    ASSERT_TRUE(status.isOk());

security/keymint/aidl/vts/functional/AttestKeyTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ TEST_P(AttestKeyTest, AllEcCurves) { 
                              attest_key, &attested_key_blob, &attested_key_characteristics,

                              &attested_key_cert_chain));



        ASSERT_GT(attested_key_cert_chain.size(), 0);

        CheckedDeleteKey(&attested_key_blob);



        AuthorizationSet hw_enforced = HwEnforcedAuthorizations(attested_key_characteristics);
@@ -612,6 +613,7 @@ TEST_P(AttestKeyTest, AllEcCurves) { 
                              attest_key, &attested_key_blob, &attested_key_characteristics,

                              &attested_key_cert_chain));



        ASSERT_GT(attested_key_cert_chain.size(), 0);

        CheckedDeleteKey(&attested_key_blob);

        CheckedDeleteKey(&attest_key.keyBlob);

weaver/aidl/default/Weaver.cpp

+29 −7
Original line number Diff line number Diff line
@@ -15,30 +15,52 @@ 
 */



#include "Weaver.h"

#include <array>



namespace aidl {

namespace android {

namespace hardware {

namespace weaver {



struct Slotinfo {

    int slot_id;

    std::vector<uint8_t> key;

    std::vector<uint8_t> value;

};



std::array<struct Slotinfo, 16> slot_array;

// Methods from ::android::hardware::weaver::IWeaver follow.



::ndk::ScopedAStatus Weaver::getConfig(WeaverConfig* out_config) {

    (void)out_config;

    *out_config = {16, 16, 16};

    return ::ndk::ScopedAStatus::ok();

}



::ndk::ScopedAStatus Weaver::read(int32_t in_slotId, const std::vector<uint8_t>& in_key, WeaverReadResponse* out_response) {

    (void)in_slotId;

    (void)in_key;

    (void)out_response;



    if (in_slotId > 15 || in_key.size() > 16) {

        *out_response = {0, {}};

        return ndk::ScopedAStatus(AStatus_fromServiceSpecificError(Weaver::STATUS_FAILED));

    }



    if (slot_array[in_slotId].key != in_key) {

        *out_response = {0, {}};

        return ndk::ScopedAStatus(AStatus_fromServiceSpecificError(Weaver::STATUS_INCORRECT_KEY));

    }



    *out_response = {0, slot_array[in_slotId].value};



    return ::ndk::ScopedAStatus::ok();

}



::ndk::ScopedAStatus Weaver::write(int32_t in_slotId, const std::vector<uint8_t>& in_key, const std::vector<uint8_t>& in_value) {

    (void)in_slotId;

    (void)in_key;

    (void)in_value;



    if (in_slotId > 15 || in_key.size() > 16 || in_value.size() > 16)

        return ::ndk::ScopedAStatus::fromStatus(STATUS_FAILED_TRANSACTION);



    slot_array[in_slotId].key = in_key;

    slot_array[in_slotId].value = in_value;



    return ::ndk::ScopedAStatus::ok();

}