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

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

Merge "Added DRIVER_ATTENTION_MONITORING_ENABLED to hardware layer."

parents eeedffd5 2c7aaa65

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
@@ -246,4 +246,5 @@ enum VehicleProperty { 
  EMERGENCY_LANE_KEEP_ASSIST_ENABLED = 287313933,

  ADAPTIVE_CRUISE_CONTROL_ENABLED = 287313935,

  HANDS_ON_DETECTION_ENABLED = 287313941,

  DRIVER_ATTENTION_MONITORING_ENABLED = 287313944,

}

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

+17 −0
Original line number Diff line number Diff line
@@ -3576,6 +3576,23 @@ enum VehicleProperty { 
    HANDS_ON_DETECTION_ENABLED =

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



    /**

     * Enable or disable driver attention monitoring.

     *

     * Set true to enable driver attention monitoring and false to disable driver attention

     * monitoring. When driver attention monitoring is enabled, a system inside the vehicle should

     * be monitoring the attention level of the driver and should send a warning if it detects that

     * the driver is distracted.

     *

     * 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

     */

    DRIVER_ATTENTION_MONITORING_ENABLED =

            0x1018 + 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
@@ -246,6 +246,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {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},

        {VehicleProperty::DRIVER_ATTENTION_MONITORING_ENABLED, VehiclePropertyAccess::READ_WRITE},

};



}  // namespace vehicle

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

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

        {VehicleProperty::DRIVER_ATTENTION_MONITORING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

};



}  // namespace vehicle

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

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

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

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

    );



}