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

Commit 668df368 authored by shrikar's avatar shrikar
Browse files

Added EMERGENCY_LANE_KEEP_ASSIST_ENABLED to hardware layer. 

Bug: 261743859
Test: atest VtsHalAutomotiveVehicle_TargetTest
Change-Id: I498061d9ef7f8ff5e21db96c9911f7c485377eab
parent eea71eab

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

+1 −0
Original line number Diff line number Diff line
@@ -239,4 +239,5 @@ enum VehicleProperty { 
  BLIND_SPOT_WARNING_ENABLED = 287313924,

  LANE_DEPARTURE_WARNING_ENABLED = 287313926,

  LANE_CENTERING_ASSIST_ENABLED = 287313930,

  EMERGENCY_LANE_KEEP_ASSIST_ENABLED = 287313933,

}

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

+17 −0
Original line number Diff line number Diff line
@@ -3449,6 +3449,23 @@ 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,



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

     * End of ADAS Properties

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

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

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ 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},

};



}  // namespace vehicle

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

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ 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},

};



}  // namespace vehicle

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

+2 −1
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ 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)

    );



}