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

Commit 808a294e authored by shrikar's avatar shrikar
Browse files

Added ADAPTIVE_CRUISE_CONTROL_ENABLED to hardware layer. 

Bug: 261737998
Test: atest VtsHalAutomotiveVehicle_TargetTest
Change-Id: I2343329b9ea086b1fa7c22c644e8f02534cbd41b
parent 668df368

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
@@ -240,4 +240,5 @@ enum VehicleProperty { 
  LANE_DEPARTURE_WARNING_ENABLED = 287313926,

  LANE_CENTERING_ASSIST_ENABLED = 287313930,

  EMERGENCY_LANE_KEEP_ASSIST_ENABLED = 287313933,

  ADAPTIVE_CRUISE_CONTROL_ENABLED = 287313935,

}

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

+18 −0
Original line number Diff line number Diff line
@@ -3466,6 +3466,24 @@ enum VehicleProperty { 
    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,



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

     * End of ADAS Properties

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

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

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {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},

};



}  // namespace vehicle

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

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {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},

};



}  // namespace vehicle

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

+2 −1
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ public final class AccessForVehicleProperty { 
        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.EMERGENCY_LANE_KEEP_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)

    );



}