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

Commit bf827a98 authored by Antonio Cortes Perez's avatar Antonio Cortes Perez Committed by Android (Google) Code Review
Browse files

Merge "Post-O. Move VMS property to hal 2.1."

parents 9b4d6d3f dd1b9d39

automotive/vehicle/2.0/Android.mk

+0 −76
Original line number Diff line number Diff line
@@ -909,44 +909,6 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (VmsMessageIntegerValuesIndex)

#

GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageIntegerValuesIndex.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.automotive.vehicle@2.0::types.VmsMessageIntegerValuesIndex



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (VmsMessageType)

#

GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.automotive.vehicle@2.0::types.VmsMessageType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Wheel)

#
@@ -1919,44 +1881,6 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (VmsMessageIntegerValuesIndex)

#

GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageIntegerValuesIndex.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.automotive.vehicle@2.0::types.VmsMessageIntegerValuesIndex



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (VmsMessageType)

#

GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.automotive.vehicle@2.0::types.VmsMessageType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Wheel)

#

automotive/vehicle/2.0/default/tests/VehicleHalManager_test.cpp

+11 −10
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ public: 
                    pValue = getValuePool()->obtainFloat(42.42);

                }

                break;

            case VehicleProperty::VEHICLE_MAP_SERVICE:

            default:

                if (requestedPropValue.prop == kCustomComplexProperty) {

                    pValue = getValuePool()->obtainComplex();

                    pValue->value.int32Values = hidl_vec<int32_t> { 10, 20 };

                    pValue->value.int64Values = hidl_vec<int64_t> { 30, 40 };
@@ -76,7 +77,7 @@ public: 
                    pValue->value.bytes = hidl_vec<uint8_t> { 1, 2, 3 };

                    pValue->value.stringValue = kCarMake;

                    break;

            default:

                }

                auto key = makeKey(toInt(property), areaId);

                if (mValues.count(key) == 0) {

                    ALOGW("");
@@ -318,10 +319,10 @@ TEST_F(VehicleHalManagerTest, subscribe_WriteOnly) { 
}



TEST_F(VehicleHalManagerTest, get_Complex) {

    invokeGet(toInt(VehicleProperty::VEHICLE_MAP_SERVICE), 0);

    invokeGet(kCustomComplexProperty, 0);



    ASSERT_EQ(StatusCode::OK, actualStatusCode);

    ASSERT_EQ(toInt(VehicleProperty::VEHICLE_MAP_SERVICE), actualValue.prop);

    ASSERT_EQ(kCustomComplexProperty, actualValue.prop);



    ASSERT_EQ(3u, actualValue.value.bytes.size());

    ASSERT_EQ(1, actualValue.value.bytes[0]);

automotive/vehicle/2.0/default/tests/VehicleHalTestUtils.h

+6 −1
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ namespace automotive { 
namespace vehicle {

namespace V2_0 {



constexpr int32_t kCustomComplexProperty = 0xbeef

        | VehiclePropertyGroup::VENDOR

        | VehiclePropertyType::COMPLEX

        | VehicleArea::GLOBAL;



const VehiclePropConfig kVehicleProperties[] = {

    {

        .prop = toInt(VehicleProperty::INFO_MAKE),
@@ -109,7 +114,7 @@ const VehiclePropConfig kVehicleProperties[] = { 


    // Complex data type.

    {

        .prop = toInt(VehicleProperty::VEHICLE_MAP_SERVICE),

        .prop = kCustomComplexProperty,

        .access = VehiclePropertyAccess::READ_WRITE,

        .changeMode = VehiclePropertyChangeMode::ON_CHANGE

    }

automotive/vehicle/2.0/types.hal

+0 −52
Original line number Diff line number Diff line
@@ -1790,26 +1790,6 @@ enum VehicleProperty: int32_t { 
        | VehiclePropertyGroup:SYSTEM

        | VehiclePropertyType:BOOLEAN

        | VehicleArea:GLOBAL),



    /*

     * Vehicle Maps Service (VMS) message

     *

     * This property uses COMPLEX data to communicate vms messages.

     *

     * Its contents are to be interpreted as follows:

     * the indices defined in VmsMessageIntegerValuesIndex are to be used to

     * read from int32Values;

     * bytes is a serialized VMS message as defined in the vms protocol

     * which is opaque to the framework;

     *

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE

     * @access VehiclePropertyAccess:READ_WRITE

     */

    VEHICLE_MAP_SERVICE = (

        0x0C00

        | VehiclePropertyGroup:SYSTEM

        | VehiclePropertyType:COMPLEX

        | VehicleArea:GLOBAL),

};



/*
@@ -2707,35 +2687,3 @@ enum Wheel : int32_t { 
    LEFT_REAR = 0x4,

    RIGHT_REAR = 0x8,

};
 


/*

 * This enum lists the types of supported VMS messages.

 */

enum VmsMessageType : int32_t {

  /* A client subscribes to a layer. */

  SUBSCRIBE = 1,



  /* A client unsubscribes from a layer. */

  UNSUBSCRIBE = 2,



  /* A client publishes a data packet. */

  DATA = 3,

};



/*

 * This enum provides the canonical mapping for VMS properties that have an

 * integer value.

 */

enum VmsMessageIntegerValuesIndex : int32_t {

  /* The message type as enumerated by VmsMessageType enum. */

  VMS_MESSAGE_TYPE = 0,



  /* The layer ID as defined in the vms protocol. */

  VMS_LAYER_ID = 1,



  /* The version of the VMS layer. */

  VMS_LAYER_VERSION = 2,



  /* The number of bytes in the payload */

  VMS_PAYLOAD_SIZE_BYTES = 3,

};

automotive/vehicle/2.1/Android.mk

+76 −0
Original line number Diff line number Diff line
@@ -207,6 +207,44 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (VmsMessageIntegerValuesIndex)

#

GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/VmsMessageIntegerValuesIndex.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.automotive.vehicle@2.1::types.VmsMessageIntegerValuesIndex



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (VmsMessageType)

#

GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/VmsMessageType.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.automotive.vehicle@2.1::types.VmsMessageType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IVehicle.hal

#
@@ -433,6 +471,44 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (VmsMessageIntegerValuesIndex)

#

GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/VmsMessageIntegerValuesIndex.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.automotive.vehicle@2.1::types.VmsMessageIntegerValuesIndex



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (VmsMessageType)

#

GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/VmsMessageType.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.automotive.vehicle@2.1::types.VmsMessageType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IVehicle.hal

#