Shifted unique IDS of HOD and Driver Attention Monitoring Enabled in HAL
Since 1 new ACC property had been introduced, we decided to shift the
unique IDs of all the ADAS properties that come after it, namely the HOD
and Driver attention monitoring properties, by 1.
Bug: 266850785
Test: atest CarPropertyManagerTest
Change-Id: I63e296c03dbac678eaed6e35d68c8cacc383f949
diff --git a/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleProperty.aidl b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleProperty.aidl
index 1039347..a39b8dd 100644
--- a/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleProperty.aidl
+++ b/automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleProperty.aidl
@@ -247,6 +247,6 @@
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,
}
diff --git a/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl
index 446a9fa..4532640 100644
--- a/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl
+++ b/automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl
@@ -3623,7 +3623,7 @@
* @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.
@@ -3640,7 +3640,7 @@
* @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