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

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

Merge "Shifted unique IDS of HOD and Driver Attention Monitoring Enabled in HAL"

parents bf0a59bc 64212ebb

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

+2 −2
Original line number Diff line number Diff line
@@ -248,6 +248,6 @@ enum VehicleProperty { 
  LANE_CENTERING_ASSIST_ENABLED = 287313930,

  EMERGENCY_LANE_KEEP_ASSIST_ENABLED = 287313933,

  ADAPTIVE_CRUISE_CONTROL_ENABLED = 287313935,

  HANDS_ON_DETECTION_ENABLED = 287313941,

  DRIVER_ATTENTION_MONITORING_ENABLED = 287313944,

  HANDS_ON_DETECTION_ENABLED = 287313942,

  DRIVER_ATTENTION_MONITORING_ENABLED = 287313945,

}

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

+2 −2
Original line number Diff line number Diff line
@@ -3642,7 +3642,7 @@ enum VehicleProperty { 
     * @access VehiclePropertyAccess.READ_WRITE

     */

    HANDS_ON_DETECTION_ENABLED =

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

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



    /**

     * Enable or disable driver attention monitoring.
@@ -3659,7 +3659,7 @@ enum VehicleProperty { 
     * @access VehiclePropertyAccess.READ_WRITE

     */

    DRIVER_ATTENTION_MONITORING_ENABLED =

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

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



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

     * End of ADAS Properties