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

Commit d7f9e234 authored by Yu Shan's avatar Yu Shan
Browse files

Add GSR Comp Req property to default config. 

This CL also updates ref impl to V2 VHAL interface.

Test: Local build.
Bug: 234066529
Bug: 235152525
Change-Id: I41d28e2b2833a356b5e980c02e37c43d16fe6696
parent 1892284e

automotive/vehicle/aidl/impl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ package { 
cc_defaults {

    name: "VehicleHalInterfaceDefaults",

    static_libs: [

        "android.hardware.automotive.vehicle-V1-ndk",

        "android.hardware.automotive.vehicle-V2-ndk",

    ],

}

automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h

+14 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ using ::aidl::android::hardware::automotive::vehicle::EvConnectorType; 
using ::aidl::android::hardware::automotive::vehicle::EvsServiceState;

using ::aidl::android::hardware::automotive::vehicle::EvsServiceType;

using ::aidl::android::hardware::automotive::vehicle::FuelType;

using ::aidl::android::hardware::automotive::vehicle::GsrComplianceRequirementType;

using ::aidl::android::hardware::automotive::vehicle::RawPropValues;

using ::aidl::android::hardware::automotive::vehicle::VehicleApPowerStateReport;

using ::aidl::android::hardware::automotive::vehicle::VehicleApPowerStateReq;
@@ -1255,6 +1256,19 @@ const std::vector<ConfigDeclaration> kVehicleProperties = { 
                                .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                        },

        },

        {

                .config =

                        {

                                .prop = toInt(

                                        VehicleProperty::

                                                GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT),

                                .access = VehiclePropertyAccess::READ,

                                .changeMode = VehiclePropertyChangeMode::STATIC,

                        },

                .initialValue = {.int32Values = {toInt(

                                         GsrComplianceRequirementType::

                                                 GSR_COMPLIANCE_REQUIRED_THROUGH_SYSTEM_IMAGE)}},

        },

#ifdef ENABLE_VENDOR_CLUSTER_PROPERTY_FOR_TESTING

        // Vendor propetry for E2E ClusterHomeService testing.

        {

automotive/vehicle/aidl/impl/utils/common/include/VehicleHalTypes.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <aidl/android/hardware/automotive/vehicle/GetValueRequest.h>

#include <aidl/android/hardware/automotive/vehicle/GetValueResult.h>

#include <aidl/android/hardware/automotive/vehicle/GetValueResults.h>

#include <aidl/android/hardware/automotive/vehicle/GsrComplianceRequirementType.h>

#include <aidl/android/hardware/automotive/vehicle/Obd2CommonIgnitionMonitors.h>

#include <aidl/android/hardware/automotive/vehicle/Obd2FuelSystemStatus.h>

#include <aidl/android/hardware/automotive/vehicle/Obd2FuelType.h>