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

Commit 4d1fe81b authored by Kai's avatar Kai Committed by Kai Wang
Browse files

Add placeholder properties for emulator 

Add some placeholder properties in google VHAL. Developers who use the
aae emulator can use them in developing new features without
implementing a real property.

Bug: 193460353
Test: build aae emulator, use adb lshal to change property values
Change-Id: I6131a4892495c4c1e1c73e078572a666a33f984e
parent 66581770

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

+36 −0
Original line number Diff line number Diff line
@@ -1061,6 +1061,42 @@ const ConfigDeclaration kVehicleProperties[]{ 
                                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                        },

        },

        {

                .config =

                        {

                                .prop = PLACEHOLDER_PROPERTY_INT,

                                .access = VehiclePropertyAccess::READ_WRITE,

                                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                        },

                .initialValue = {.int32Values = {0}},

        },

        {

                .config =

                        {

                                .prop = PLACEHOLDER_PROPERTY_FLOAT,

                                .access = VehiclePropertyAccess::READ_WRITE,

                                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                        },

                .initialValue = {.floatValues = {0.0f}},

        },

        {

                .config =

                        {

                                .prop = PLACEHOLDER_PROPERTY_BOOLEAN,

                                .access = VehiclePropertyAccess::READ_WRITE,

                                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                        },

                .initialValue = {.int32Values = {0 /* false */}},

        },

        {

                .config =

                        {

                                .prop = PLACEHOLDER_PROPERTY_STRING,

                                .access = VehiclePropertyAccess::READ_WRITE,

                                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                        },

                .initialValue = {.stringValue = {"Test"}},

        },

#ifdef ENABLE_VENDOR_CLUSTER_PROPERTY_FOR_TESTING

        // Vendor propetry for E2E ClusterHomeService testing.

        {

automotive/vehicle/2.0/default/impl/vhal_v2_0/PropertyUtils.h

+13 −0
Original line number Diff line number Diff line
@@ -100,6 +100,19 @@ constexpr int32_t VENDOR_CLUSTER_NAVIGATION_STATE = 
        toVendor(VehicleProperty::CLUSTER_NAVIGATION_STATE);

#endif  // ENABLE_VENDOR_CLUSTER_PROPERTY_FOR_TESTING



/**

 * These properties are placeholder properties for developers to test new features without

 * implementing a real property.

 */

constexpr int32_t PLACEHOLDER_PROPERTY_INT =

        0x2a11 | VehiclePropertyGroup::VENDOR | VehicleArea::GLOBAL | VehiclePropertyType::INT32;

constexpr int32_t PLACEHOLDER_PROPERTY_FLOAT =

        0x2a11 | VehiclePropertyGroup::VENDOR | VehicleArea::GLOBAL | VehiclePropertyType::FLOAT;

constexpr int32_t PLACEHOLDER_PROPERTY_BOOLEAN =

        0x2a11 | VehiclePropertyGroup::VENDOR | VehicleArea::GLOBAL | VehiclePropertyType::BOOLEAN;

constexpr int32_t PLACEHOLDER_PROPERTY_STRING =

        0x2a11 | VehiclePropertyGroup::VENDOR | VehicleArea::GLOBAL | VehiclePropertyType::STRING;



const int32_t kHvacPowerProperties[] = {

    toInt(VehicleProperty::HVAC_FAN_SPEED),

    toInt(VehicleProperty::HVAC_FAN_DIRECTION),

automotive/vehicle/2.0/default/impl/vhal_v2_0/tests/DefaultVhalImpl_test.cpp

+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)117, configs.size());

    EXPECT_EQ((size_t)121, configs.size());

}



TEST_F(DefaultVhalImplTest, testGetDefaultPropertyFloat) {