mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 16:50:18 +00:00
Merge "IRPC test: use version from RpcHardwareInfo" am: b13e5b8cdd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2252697 Change-Id: I3e48d76022b720445a3a8b028f069b6470d23cd0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user