Merge "Weaver: modify default HAL for passing VTS" am: 2697d16c43 am: 21af98f74c am: 3405632a1f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1914892

Change-Id: Ib6c667c5b830d22555f9abea0c6b33ae9cef83cc
This commit is contained in:
Chengyou Ho 2021-12-09 04:42:20 +00:00 committed by Automerger Merge Worker
commit b357ac04c7

View file

@ -15,30 +15,52 @@
*/ */
#include "Weaver.h" #include "Weaver.h"
#include <array>
namespace aidl { namespace aidl {
namespace android { namespace android {
namespace hardware { namespace hardware {
namespace weaver { 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. // Methods from ::android::hardware::weaver::IWeaver follow.
::ndk::ScopedAStatus Weaver::getConfig(WeaverConfig* out_config) { ::ndk::ScopedAStatus Weaver::getConfig(WeaverConfig* out_config) {
(void)out_config; *out_config = {16, 16, 16};
return ::ndk::ScopedAStatus::ok(); return ::ndk::ScopedAStatus::ok();
} }
::ndk::ScopedAStatus Weaver::read(int32_t in_slotId, const std::vector<uint8_t>& in_key, WeaverReadResponse* out_response) { ::ndk::ScopedAStatus Weaver::read(int32_t in_slotId, const std::vector<uint8_t>& in_key, WeaverReadResponse* out_response) {
(void)in_slotId;
(void)in_key; if (in_slotId > 15 || in_key.size() > 16) {
(void)out_response; *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(); 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) { ::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; if (in_slotId > 15 || in_key.size() > 16 || in_value.size() > 16)
(void)in_value; 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(); return ::ndk::ScopedAStatus::ok();
} }