Merge "Add support for GSR property in HIDL ref VHAL." into tm-qpr-dev am: f759bf1c03

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

Change-Id: I510f72780281d5dd9a2782cf82545bd077363b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Shan
2022-06-24 18:37:41 +00:00
committed by Automerger Merge Worker
2 changed files with 14 additions and 1 deletions

View File

@@ -1109,6 +1109,19 @@ const ConfigDeclaration kVehicleProperties[]{
},
.initialValue = {.stringValue = {"Test"}},
},
// This property is later defined in the AIDL VHAL interface. However, HIDL VHAL might
// require support for this property to meet EU regulation.
{
.config =
{
// GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT
.prop = 0x11400F47,
.access = VehiclePropertyAccess::READ,
.changeMode = VehiclePropertyChangeMode::STATIC,
},
// GsrComplianceRequirementType::GSR_COMPLIANCE_REQUIRED_V1
.initialValue = {.int32Values = {1}},
},
#ifdef ENABLE_VENDOR_CLUSTER_PROPERTY_FOR_TESTING
// Vendor propetry for E2E ClusterHomeService testing.
{

View File

@@ -141,7 +141,7 @@ class DefaultVhalImplTest : public ::testing::Test {
TEST_F(DefaultVhalImplTest, testListProperties) {
std::vector<VehiclePropConfig> configs = mHal->listProperties();
EXPECT_EQ((size_t)121, configs.size());
EXPECT_EQ((size_t)122, configs.size());
}
TEST_F(DefaultVhalImplTest, testGetDefaultPropertyFloat) {