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

Commit 5eaf7250 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Introduce CAMERA_SERVICE_CURRENT_STATE VHAL property" into main

parents f1a5918b 7cc8453e

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

+30 −0
Original line number Diff line number Diff line
@@ -1128,6 +1128,14 @@ 
                ],

                "data_enum": "VehicleAutonomousState"

            },

            {

                "name": "CAMERA_SERVICE_CURRENT_STATE",

                "value": 289476429,

                "data_enums": [

                    "CameraServiceState"

                ],

                "data_enum": "CameraServiceState"

            },

            {

                "name": "AUTOMATIC_EMERGENCY_BRAKING_ENABLED",

                "value": 287313920
@@ -2818,6 +2826,28 @@ 
            }

        ]

    },

    {

        "name": "CameraServiceState",

        "package": "android.hardware.automotive.vehicle",

        "values": [

            {

                "name": "UNAVAILABLE",

                "value": 0

            },

            {

                "name": "INACTIVE",

                "value": 1

            },

            {

                "name": "REQUESTED",

                "value": 2

            },

            {

                "name": "ACTIVE",

                "value": 3

            }

        ]

    },

    {

        "name": "GsrComplianceRequirementType",

        "package": "android.hardware.automotive.vehicle",

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

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::VEHICLE_IN_USE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::CLUSTER_HEARTBEAT, VehiclePropertyAccess::WRITE},

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

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

        {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/cpp/ChangeModeForVehicleProperty.h

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

        {VehicleProperty::CLUSTER_HEARTBEAT, VehiclePropertyChangeMode::ON_CHANGE},

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

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

        {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/cpp/VersionForVehicleProperty.h

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

        {VehicleProperty::CLUSTER_HEARTBEAT, 3},

        {VehicleProperty::VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL, 3},

        {VehicleProperty::CAMERA_SERVICE_CURRENT_STATE, 3},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_ENABLED, 2},

        {VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_STATE, 2},

        {VehicleProperty::FORWARD_COLLISION_WARNING_ENABLED, 2},

automotive/vehicle/aidl/generated_lib/java/AccessForVehicleProperty.java

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.VEHICLE_IN_USE, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.CLUSTER_HEARTBEAT, VehiclePropertyAccess.WRITE),

        Map.entry(VehicleProperty.VEHICLE_DRIVING_AUTOMATION_CURRENT_LEVEL, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.CAMERA_SERVICE_CURRENT_STATE, VehiclePropertyAccess.WRITE),

        Map.entry(VehicleProperty.AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.FORWARD_COLLISION_WARNING_ENABLED, VehiclePropertyAccess.READ_WRITE),