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

Merge "IRPC test: use version from RpcHardwareInfo" am: b13e5b8cdd am: feb32b39a7

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

Change-Id: Icf3680934f20f0d3127266f690c112c8033011b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tri Vo
2022-10-13 04:21:33 +00:00
committed by Automerger Merge Worker
parent 31ac8f3da7 feb32b39a7
commit e6af4d18df
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
View File

@@ -200,9 +200,7 @@ TEST(NonParameterizedTests, eachRpcHasAUniqueId) {
RpcHardwareInfo hwInfo;
ASSERT_TRUE(rpc->getHardwareInfo(&hwInfo).isOk());
int32_t version;
ASSERT_TRUE(rpc->getInterfaceVersion(&version).isOk());
if (version >= VERSION_WITH_UNIQUE_ID_SUPPORT) {
if (hwInfo.versionNumber >= VERSION_WITH_UNIQUE_ID_SUPPORT) {
ASSERT_TRUE(hwInfo.uniqueId);
auto [_, wasInserted] = uniqueIds.insert(*hwInfo.uniqueId);
EXPECT_TRUE(wasInserted);
@@ -232,10 +230,7 @@ TEST_P(GetHardwareInfoTests, supportsValidCurve) {
* Verify that the unique id is within the length limits as described in RpcHardwareInfo.aidl.
*/
TEST_P(GetHardwareInfoTests, uniqueId) {
int32_t version;
ASSERT_TRUE(provisionable_->getInterfaceVersion(&version).isOk());
if (version < VERSION_WITH_UNIQUE_ID_SUPPORT) {
if (rpcHardwareInfo.versionNumber < VERSION_WITH_UNIQUE_ID_SUPPORT) {
return;
}