Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f759bf1c authored by Yu Shan's avatar Yu Shan Committed by Android (Google) Code Review
Browse files

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

parents 7ff24f2a 6a553afe
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -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.
        {
+1 −1
Original line number Diff line number Diff line
@@ -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) {