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

Commit a5e54678 authored by Shrikar Amirisetty's avatar Shrikar Amirisetty Committed by Android (Google) Code Review
Browse files

Merge changes from topics "adaptive_cruise_control_enabled",... 

Merge changes from topics "adaptive_cruise_control_enabled", "emergency_lane_keep_assist_enabled", "hands_on_detection_enabled"

* changes:
  Added HANDS_ON_DETECTION_ENABLED to hardware layer.
  Added ADAPTIVE_CRUISE_CONTROL_ENABLED to hardware layer.
  Added EMERGENCY_LANE_KEEP_ASSIST_ENABLED to hardware layer.
parents d30ff95a 37833e17

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
@@ -242,4 +242,7 @@ enum VehicleProperty { 
  BLIND_SPOT_WARNING_ENABLED = 287313924,

  LANE_DEPARTURE_WARNING_ENABLED = 287313926,

  LANE_CENTERING_ASSIST_ENABLED = 287313930,

  EMERGENCY_LANE_KEEP_ASSIST_ENABLED = 287313933,

  ADAPTIVE_CRUISE_CONTROL_ENABLED = 287313935,

  HANDS_ON_DETECTION_ENABLED = 287313941,

}

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

+51 −0
Original line number Diff line number Diff line
@@ -3505,6 +3505,57 @@ enum VehicleProperty { 
    LANE_CENTERING_ASSIST_ENABLED =

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



    /*

     * Enable or disable emergency lane keep assist (ELKA).

     *

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

     * the vehicle should be on and monitoring for unsafe lane changes by the driver. When an unsafe

     * maneuver is detected, ELKA alerts the driver and applies steering corrections to keep the

     * vehicle in its original lane.

     *

     * 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

     */

    EMERGENCY_LANE_KEEP_ASSIST_ENABLED =

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



    /**

     * Enable or disable adaptive cruise control (ACC).

     *

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

     * vehicle should be turned on and waiting for an activation signal from the driver. Once the

     * feature is activated, the ADAS system in the car should be accelerating and braking in a way

     * that allows the vehicle to maintain a set speed and to maintain a set distance gap from a

     * leading vehicle.

     *

     * 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

     */

    ADAPTIVE_CRUISE_CONTROL_ENABLED =

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



    /**

     * Enable or disable hands on detection (HOD).

     *

     * Set true to enable HOD and false to disable HOD. When HOD is enabled, a system inside the

     * vehicle should be monitoring the presence of the driver's hands on the steering wheel and

     * send a warning if it detects that the driver's hands are no longer on the steering wheel.

     *

     * 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

     */

    HANDS_ON_DETECTION_ENABLED =

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



    /***************************************************************************

     * End of ADAS Properties

     **************************************************************************/

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

+3 −0
Original line number Diff line number Diff line
@@ -242,6 +242,9 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::BLIND_SPOT_WARNING_ENABLED, VehiclePropertyAccess::READ_WRITE},

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

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

        {VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::HANDS_ON_DETECTION_ENABLED, VehiclePropertyAccess::READ_WRITE},

};



}  // namespace vehicle

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

+3 −0
Original line number Diff line number Diff line
@@ -242,6 +242,9 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::BLIND_SPOT_WARNING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

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

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

        {VehicleProperty::EMERGENCY_LANE_KEEP_ASSIST_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::ADAPTIVE_CRUISE_CONTROL_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::HANDS_ON_DETECTION_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

};



}  // namespace vehicle

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

+4 −1
Original line number Diff line number Diff line
@@ -233,7 +233,10 @@ public final class AccessForVehicleProperty { 
        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)

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

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

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

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

    );



}