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

Commit 4efdd077 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11890100 from 8258ec17 to 24Q3-release 

Change-Id: I04c04c454182d5dc02d9c5e9eaf78df41f13ecc6
parents 7360a2df 8258ec17

automotive/vehicle/aidl/aidl_test/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ cc_test { 
cc_test {

    name: "VehiclePropertyAnnotationCppTest",

    srcs: ["VehiclePropertyAnnotationCppTest.cpp"],

    header_libs: ["IVehicleGeneratedHeaders"],

    header_libs: ["IVehicleGeneratedHeaders-V3"],

    defaults: ["VehicleHalInterfaceDefaults"],

    test_suites: ["general-tests"],

}

automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json

+6 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ 
            {

                "name": "PER_DISPLAY_BRIGHTNESS",

                "value": 289475076,

                "description": "Property to represent brightness of the displays which are controlled separately.\nSome cars have one or more displays whose brightness is controlled separately and this property is to inform the brightness of each passenger display. In cars where all displays' brightness is controlled together, they must use DISPLAY_BRIGHTNESS.\nOnly one of DISPLAY_BRIGHTNESS and PER_DISPLAY_BRIGHTNESS should be implemented. If both are available, PER_DISPLAY_BRIGHTNESS is used by AAOS.\nThe display port uniquely identifies a physical connector on the device for display output, ranging from 0 to 255.\nWriting this property must cause an on property change event that contains the same [display port, brightness] tuple even if the new display brightness is the same as the current value.\nTo get the display brightness for a specific display port, the GetValueRequest must contain a VehiclePropValue, which contains one int32Value: displayPort. Getting this property without specifying the the display port is undefined behavior.\nint32Values[0] : display port int32Values[1] : brightness"

                "description": "Property to represent brightness of the displays which are controlled separately.\nSome cars have one or more displays whose brightness is controlled separately and this property is to inform the brightness of each passenger display. In cars where all displays' brightness is controlled together, they must use DISPLAY_BRIGHTNESS.\nOnly one of DISPLAY_BRIGHTNESS and PER_DISPLAY_BRIGHTNESS should be implemented. If both are available, PER_DISPLAY_BRIGHTNESS is used by AAOS.\nIf this is supported, PER_DISPLAY_MAX_BRIGHTNESS must be supported to represent the max display brightness for each display. Otherwise, the max display brightness is by default 1. The VehicleAreaConfig.maxInt32Value must not be used to represent max display brightness, because maxInt32Value is defined to be the max value for all the elements inside the integer value, which includes display port and brightness. So it is not meaningful.\nThe display port uniquely identifies a physical connector on the device for display output, ranging from 0 to 255.\nWriting this property must cause an on property change event that contains the same [display port, brightness] tuple even if the new display brightness is the same as the current value.\nTo get the display brightness for a specific display port, the GetValueRequest must contain a VehiclePropValue, which contains one int32Value: displayPort. Getting this property without specifying the the display port is undefined behavior.\nint32Values[0] : display port int32Values[1] : brightness"

            },

            {

                "name": "Valet mode enabled",
@@ -1363,6 +1363,11 @@ 
                "data_enum": "CameraServiceState",

                "description": "Reports current state of CarEvsService types.\nInforms other components of current state of each CarEvsService service type with values defined in CameraServiceState. CarEvsService will update this property whenever a service type transitions into a new state.\nint32[0]: Current state of REARVIEW service type. int32[1]: Current state of SURROUNDVIEW service type. int32[2]: Current state of FRONTVIEW service type. int32[3]: Current state of LEFTVIEW service type. int32[4]: Current state of RIGHTVIEW service type. int32[5]: Current state of DRIVERVIEW service type. int32[6]: Current state of FRONT_PASSENGERVIEW service type. int32[7]: Current state of REAR_PASSENGERVIEW service type."

            },

            {

                "name": "PER_DISPLAY_MAX_BRIGHTNESS",

                "value": 289476430,

                "description": "Property to represent max brightness of the displays which are controlled separately.\nThis is only used if PER_DISPLAY_BRIGHTNESS is supported.\nThe display port uniquely identifies a physical connector on the device for display output, ranging from 0 to 255.\nint32Values[0] : display port number int32Values[1] : max brightness for display port number specified at int32Values[0] int32Values[2] : display port number int32Values[3] : max brightness for display port number specified at int32Values[2] ..."

            },

            {

                "name": "AUTOMATIC_EMERGENCY_BRAKING_ENABLED",

                "value": 287313920,

automotive/vehicle/aidl/generated_lib/4/cpp/AccessForVehicleProperty.h

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::CLUSTER_HEARTBEAT, VehiclePropertyAccess::WRITE},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL, VehiclePropertyAccess::READ},

        {VehicleProperty::CAMERA_SERVICE_CURRENT_STATE, VehiclePropertyAccess::WRITE},

        {VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS, VehiclePropertyAccess::READ},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::FORWARD_COLLISION_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},

automotive/vehicle/aidl/generated_lib/4/cpp/ChangeModeForVehicleProperty.h

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::CLUSTER_HEARTBEAT, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CAMERA_SERVICE_CURRENT_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::FORWARD_COLLISION_WARNING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

automotive/vehicle/aidl/generated_lib/4/cpp/VersionForVehicleProperty.h

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = { 
        {VehicleProperty::CLUSTER_HEARTBEAT, 3},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL, 3},

        {VehicleProperty::CAMERA_SERVICE_CURRENT_STATE, 3},

        {VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS, 3},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_ENABLED, 2},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_STATE, 2},

        {VehicleProperty::FORWARD_COLLISION_WARNING_ENABLED, 2},