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

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

Merge changes from topics "BlindSpotWarningEnabled",... 

Merge changes from topics "BlindSpotWarningEnabled", "ForwardCollisionWarningEnabled", "LaneDepartureWarningEnabled"

* changes:
  Add HAL changes for LANE_DEPARTURE_WARNING_ENABLED
  Add HAL changes for BLIND_SPOT_WARNING_ENABLED
  Add HAL changes for FORWARD_COLLISION_WARNING_ENABLED
parents 19814856 7a46cef0

automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleProperty.aidl

+3 −0
Original line number Diff line number Diff line
@@ -235,5 +235,8 @@ enum VehicleProperty { 
  SUPPORTED_PROPERTY_IDS = 289476424,

  SHUTDOWN_REQUEST = 289410889,

  AUTOMATIC_EMERGENCY_BRAKING_ENABLED = 287313920,

  FORWARD_COLLISION_WARNING_ENABLED = 287313922,

  BLIND_SPOT_WARNING_ENABLED = 287313924,

  LANE_DEPARTURE_WARNING_ENABLED = 287313926,

  LANE_CENTERING_ASSIST_ENABLED = 287313930,

}

automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleProperty.aidl

+46 −0
Original line number Diff line number Diff line
@@ -3382,6 +3382,52 @@ enum VehicleProperty { 
    AUTOMATIC_EMERGENCY_BRAKING_ENABLED =

            0x1000 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,



    /**

     * Enable or disable forward collision warning (FCW).

     *

     * Set true to enable FCW and false to disable FCW. When FCW is enabled, the ADAS system in the

     * vehicle should be turned on and monitoring for potential collisions.

     *

     * This property is defined as read_write, but OEMs have the option to implement it as read

     * only.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     */

    FORWARD_COLLISION_WARNING_ENABLED =

            0x1002 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,



    /**

     * Enable and disable blind spot warning (BSW).

     *

     * Set true to enable BSW and false to disable BSW. When BSW is enabled, the ADAS system in the

     * vehicle should be turned on and monitoring for objects in the vehicle’s blind spots.

     *

     * This property is defined as read_write, but OEMs have the option to implement it as read

     * only.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     */

    BLIND_SPOT_WARNING_ENABLED =

            0x1004 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,



    /**

     * Enable or disable lane departure warning (LDW).

     *

     * Set true to enable LDW and false to disable LDW. When LDW is enabled, the ADAS system in the

     * vehicle should be turned on and monitoring if the vehicle is approaching or crossing lane

     * lines, in which case a warning will be given.

     *

     * This property is defined as read_write, but OEMs have the option to implement it as read

     * only.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     */

    LANE_DEPARTURE_WARNING_ENABLED =

            0x1006 + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.BOOLEAN,



    /**

     * Enable or disable lane centering assist (LCA).

     *

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

+3 −0
Original line number Diff line number Diff line
@@ -235,6 +235,9 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::SUPPORTED_PROPERTY_IDS, VehiclePropertyAccess::READ},

        {VehicleProperty::SHUTDOWN_REQUEST, VehiclePropertyAccess::WRITE},

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

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

        {VehicleProperty::BLIND_SPOT_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::LANE_DEPARTURE_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},

};

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

+3 −0
Original line number Diff line number Diff line
@@ -235,6 +235,9 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::SUPPORTED_PROPERTY_IDS, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::SHUTDOWN_REQUEST, VehiclePropertyChangeMode::ON_CHANGE},

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

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

        {VehicleProperty::BLIND_SPOT_WARNING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::LANE_DEPARTURE_WARNING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::LANE_CENTERING_ASSIST_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

};

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

+3 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.SUPPORTED_PROPERTY_IDS, VehiclePropertyAccess.READ),

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

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

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

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

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

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

    );