tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update weaver AIDL default to use V2"

Browse source
This commit is contained in:
Chengyou Ho 2022-12-08 20:43:42 +00:00 committed by Android (Google) Code Review
commit a9edb59c9f
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compatibility_matrices/compatibility_matrix.current.xml
View file

@ -693,7 +693,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.weaver</name>
<version>1</version>
<version>2</version>
<interface>
<name>IWeaver</name>
<instance>default</instance>

2
weaver/aidl/default/Android.bp
View file

@ -34,7 +34,7 @@ cc_binary {
"Weaver.cpp",
],
shared_libs: [
"android.hardware.weaver-V1-ndk",
"android.hardware.weaver-V2-ndk",
"libbase",
"libbinder_ndk",
],

11
weaver/aidl/default/Weaver.cpp
View file

@ -37,18 +37,19 @@ std::array<struct Slotinfo, 16> slot_array;
}
::ndk::ScopedAStatus Weaver::read(int32_t in_slotId, const std::vector<uint8_t>& in_key, WeaverReadResponse* out_response) {
using ::aidl::android::hardware::weaver::WeaverReadStatus;
if (in_slotId > 15 || in_key.size() > 16) {
*out_response = {0, {}};
return ndk::ScopedAStatus(AStatus_fromServiceSpecificError(Weaver::STATUS_FAILED));
*out_response = {0, {}, WeaverReadStatus::FAILED};
return ndk::ScopedAStatus::ok();
}
if (slot_array[in_slotId].key != in_key) {
*out_response = {0, {}};
return ndk::ScopedAStatus(AStatus_fromServiceSpecificError(Weaver::STATUS_INCORRECT_KEY));
*out_response = {0, {}, WeaverReadStatus::INCORRECT_KEY};
return ndk::ScopedAStatus::ok();
}
*out_response = {0, slot_array[in_slotId].value};
*out_response = {0, slot_array[in_slotId].value, WeaverReadStatus::OK};
return ::ndk::ScopedAStatus::ok();
}

2
weaver/aidl/default/android.hardware.weaver-service.example.xml
View file

@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.weaver</name>
<version>1</version>
<version>2</version>
<interface>
<name>IWeaver</name>
<instance>default</instance>