Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 15:58:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update weaver AIDL default to use V2 am: 316cf58d49

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

Change-Id: Iaa580ba44e27fc62c4f357a8d9c5f802b2124191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Devin Moore
2023-07-20 17:44:23 +00:00
committed by Automerger Merge Worker
parent 43f1c1af5d 316cf58d49
commit 2965a93c24
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compatibility_matrices/compatibility_matrix.9.xml
View File

@@ -739,7 +739,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>