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

Commit f1c5aa2b authored by Shrikar Amirisetty's avatar Shrikar Amirisetty Committed by Android (Google) Code Review
Browse files

Merge "Added new VehicleAreConfig.aidl fields to ProtoMessageConverter" into main

parents 371e5fc7 7157173f

automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/src/ProtoMessageConverter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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<proto::VehiclePropertyAccess>(toInt(areaConfig.access)));

        protoACfg->set_min_int64_value(areaConfig.minInt64Value);

        protoACfg->set_max_int64_value(areaConfig.maxInt64Value);

        protoACfg->set_min_float_value(areaConfig.minFloatValue);
@@ -95,6 +96,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<aidl_vehicle::VehiclePropertyAccess>(protoAcfg.access()),

                .minInt32Value = protoAcfg.min_int32_value(),

                .maxInt32Value = protoAcfg.max_int32_value(),

                .minInt64Value = protoAcfg.min_int64_value(),

automotive/vehicle/aidl/impl/proto/android/hardware/automotive/vehicle/VehicleAreaConfig.proto

+3 −1
Original line number Diff line number Diff line
@@ -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;

};