Add publisher ID to DATA messages

VMS Core routing needs the publisher ID in order to route correctly.

Test: all tests pass + adding tests for new use cases
bug: 63933446
Change-Id: I3acd2a3efebdedbf9d65af18d70928380e9b44d1
This commit is contained in:
Asaf Rosenfeld
2017-07-18 11:00:29 -07:00
parent 3c8177f967
commit e8d8c03e9a
2 changed files with 48 additions and 1 deletions

View File

@@ -226,6 +226,25 @@ $(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (VmsDataMessageIntegerValuesIndex)
#
GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/VmsDataMessageIntegerValuesIndex.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.VmsDataMessageIntegerValuesIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (VmsMessageType)
#
@@ -547,6 +566,25 @@ $(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (VmsDataMessageIntegerValuesIndex)
#
GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_1/VmsDataMessageIntegerValuesIndex.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.VmsDataMessageIntegerValuesIndex
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (VmsMessageType)
#

View File

@@ -681,7 +681,7 @@ enum VmsBaseMessageIntegerValuesIndex : int32_t {
};
/*
* This enum provides the canonical mapping for VMS SUBMIT, UNSUBMIT and DATA
* This enum provides the canonical mapping for VMS SUBMIT and UNSUBMIT
* messages integer value properties.
*/
enum VmsSimpleMessageIntegerValuesIndex : VmsBaseMessageIntegerValuesIndex {
@@ -695,6 +695,15 @@ enum VmsSimpleMessageIntegerValuesIndex : VmsBaseMessageIntegerValuesIndex {
VMS_LAYER_SUB_TYPE = 3,
};
/*
* This enum provides the canonical mapping for VMS DATA
* message integer value properties.
*/
enum VmsDataMessageIntegerValuesIndex : VmsSimpleMessageIntegerValuesIndex {
/* A publisher ID of the client that published this message. */
VMS_PUBLISHER_ID = 4,
};
/*
* This enum provides the canonical mapping for VMS offering messages integer
* value properties