From 7157173f347dddbee4c6537cb252c193cf08b301 Mon Sep 17 00:00:00 2001 From: shrikar Date: Tue, 31 Oct 2023 16:28:37 +0000 Subject: [PATCH] Added new VehicleAreConfig.aidl fields to ProtoMessageConverter Bug: 290801790 Test: atest VehicleHalProtoMessageConverterTest Change-Id: I8111bde08861a4b66e0fb9acb08dee2cec39719a --- .../proto_message_converter/src/ProtoMessageConverter.cpp | 2 ++ .../hardware/automotive/vehicle/VehicleAreaConfig.proto | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/src/ProtoMessageConverter.cpp b/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/src/ProtoMessageConverter.cpp index 6b789bb7a9..19911a3c20 100644 --- a/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/src/ProtoMessageConverter.cpp +++ b/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/src/ProtoMessageConverter.cpp @@ -67,6 +67,7 @@ void aidlToProto(const aidl_vehicle::VehiclePropConfig& in, proto::VehiclePropCo for (auto& areaConfig : in.areaConfigs) { auto* protoACfg = out->add_area_configs(); protoACfg->set_area_id(areaConfig.areaId); + protoACfg->set_access(static_cast(toInt(areaConfig.access))); protoACfg->set_min_int64_value(areaConfig.minInt64Value); protoACfg->set_max_int64_value(areaConfig.maxInt64Value); protoACfg->set_min_float_value(areaConfig.minFloatValue); @@ -94,6 +95,7 @@ void protoToAidl(const proto::VehiclePropConfig& in, aidl_vehicle::VehiclePropCo auto cast_to_acfg = [](const proto::VehicleAreaConfig& protoAcfg) { auto vehicleAreaConfig = aidl_vehicle::VehicleAreaConfig{ .areaId = protoAcfg.area_id(), + .access = static_cast(protoAcfg.access()), .minInt32Value = protoAcfg.min_int32_value(), .maxInt32Value = protoAcfg.max_int32_value(), .minInt64Value = protoAcfg.min_int64_value(), diff --git a/automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/VehicleAreaConfig.proto b/automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/VehicleAreaConfig.proto index 8093658477..7ea8540cc3 100644 --- a/automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/VehicleAreaConfig.proto +++ b/automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/VehicleAreaConfig.proto @@ -18,6 +18,8 @@ syntax = "proto3"; package android.hardware.automotive.vehicle.proto; +import "android/hardware/automotive/vehicle/VehiclePropertyAccess.proto"; + /* Must be in sync with VehicleAreaConfig.aidl. */ message VehicleAreaConfig { /* Area id is ignored for VehiclePropertyGroup:GLOBAL properties. */ @@ -43,6 +45,6 @@ message VehicleAreaConfig { * assumed all @data_enum values are supported unless specified through another mechanism. */ repeated int64 supported_enum_values = 8; - int32 access = 9; + VehiclePropertyAccess access = 9; bool support_variable_update_rate = 10; };