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

Commit 6439b425 authored by Kai Wang's avatar Kai Wang Committed by Automerger Merge Worker
Browse files

Merge "Add placeholder properties for emulator" into sc-v2-dev am: c490c135 

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

Change-Id: I5822c80b2405f509cbfe339667d128cda7c8ae49
parents db801cc2 c490c135

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

+36 −0
Original line number Diff line number Diff line
@@ -1097,6 +1097,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
@@ -189,6 +189,19 @@ enum class FakeDataCommand : int32_t { 
    KeyPress = 100,

};



/**

 * 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),