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

Commit 30a1b987 authored by Aaqib Ismail's avatar Aaqib Ismail Committed by Android (Google) Code Review
Browse files

Merge changes I724a9e63,I2e2c1305 

* changes:
  Add HAL documentation for ErrorState values
  Add NOT_AVAILABLE_POOR_VISIBILITY to supportedEnumValues
parents 745f3428 38ecabba

automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json

+6 −3
Original line number Diff line number Diff line
@@ -3166,7 +3166,7 @@ 
            "property": "VehicleProperty::AUTOMATIC_EMERGENCY_BRAKING_STATE",

            "defaultValue": {

                "int32Values": [

                    "AutomaticEmergencyBrakingState::ENABLED"

                    "ErrorState::NOT_AVAILABLE_DISABLED"

                ]

            },

            "areas": [
@@ -3174,6 +3174,7 @@ 
                    "areaId": 0,

                    "supportedEnumValues": [

                        "ErrorState::NOT_AVAILABLE_SAFETY",

                        "ErrorState::NOT_AVAILABLE_POOR_VISIBILITY",

                        "ErrorState::NOT_AVAILABLE_SPEED_HIGH",

                        "ErrorState::NOT_AVAILABLE_SPEED_LOW",

                        "ErrorState::NOT_AVAILABLE_DISABLED",
@@ -3188,7 +3189,7 @@ 
            "property": "VehicleProperty::FORWARD_COLLISION_WARNING_ENABLED",

            "defaultValue": {

                "int32Values": [

                    0

                    1

                ]

            }

        },
@@ -3204,6 +3205,7 @@ 
                    "areaId": 0,

                    "supportedEnumValues": [

                        "ErrorState::NOT_AVAILABLE_SAFETY",

                        "ErrorState::NOT_AVAILABLE_POOR_VISIBILITY",

                        "ErrorState::NOT_AVAILABLE_SPEED_HIGH",

                        "ErrorState::NOT_AVAILABLE_SPEED_LOW",

                        "ErrorState::NOT_AVAILABLE_DISABLED",
@@ -3217,7 +3219,7 @@ 
            "property": "VehicleProperty::BLIND_SPOT_WARNING_ENABLED",

            "defaultValue": {

                "int32Values": [

                    0

                    1

                ]

            }

        },
@@ -3233,6 +3235,7 @@ 
                    "areaId": "Constants::MIRROR_DRIVER_LEFT_RIGHT",

                    "supportedEnumValues": [

                        "ErrorState::NOT_AVAILABLE_SAFETY",

                        "ErrorState::NOT_AVAILABLE_POOR_VISIBILITY",

                        "ErrorState::NOT_AVAILABLE_SPEED_HIGH",

                        "ErrorState::NOT_AVAILABLE_SPEED_LOW",

                        "ErrorState::NOT_AVAILABLE_DISABLED",

automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/ErrorState.aidl

+19 −0
Original line number Diff line number Diff line
@@ -31,9 +31,28 @@ enum ErrorState { 
     * include additional states.

     */

    OTHER_ERROR_STATE = -1,

    /**

     * Vehicle property is not available because the feature is disabled.

     */

    NOT_AVAILABLE_DISABLED = -2,

    /**

     * Vehicle property is not available because the vehicle speed is too low to use this feature.

     */

    NOT_AVAILABLE_SPEED_LOW = -3,

    /**

     * Vehicle property is not available because the vehicle speed is too high to use this feature.

     */

    NOT_AVAILABLE_SPEED_HIGH = -4,

    /**

     * Vehicle property is not available because sensor or camera visibility is insufficient to use

     * this feature. For example, this can be caused by bird poop blocking the camera, poor weather

     * conditions such as snow or fog, or by any object obstructing the required sensors.

     */

    NOT_AVAILABLE_POOR_VISIBILITY = -5,

    /**

     * Vehicle property is not available because there is a safety risk that makes this feature

     * unavailable to use presently. For example, this can be caused by someone blocking the trunk

     * door while it is closing, or by the system being in a faulty state.

     */

    NOT_AVAILABLE_SAFETY = -6,

}