Merge "Add ENGINE_OIL_LEVEL, PARKING_BRAKE_AUTO_APPLY"

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

@@ -356,6 +356,14 @@ const ConfigDeclaration kVehicleProperties[]{
          },
      .initialValue = {.int32Values = {toInt(VehicleIgnitionState::ON)}}},
 
+    {.config =
+         {
+             .prop = toInt(VehicleProperty::ENGINE_OIL_LEVEL),
+             .access = VehiclePropertyAccess::READ,
+             .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+         },
+     .initialValue = {.int32Values = {toInt(VehicleOilLevel::NORMAL)}}},
+
     {.config =
          {
              .prop = toInt(VehicleProperty::ENGINE_OIL_TEMP),

automotive/vehicle/2.0/types.hal

@@ -252,6 +252,19 @@ enum VehicleProperty: int32_t {
         | VehiclePropertyType:FLOAT
         | VehicleArea:GLOBAL),
 
+    /**
+     * Engine oil level
+     *
+     * @change_mode VehiclePropertyChangeMode:ON_CHANGE
+     * @access VehiclePropertyAccess:READ
+     * @data_enum VehicleOilLevel
+     */
+    ENGINE_OIL_LEVEL = (
+        0x0303
+        | VehiclePropertyGroup:SYSTEM
+        | VehiclePropertyType:INT32
+        | VehicleArea:GLOBAL),
+
     /**
      * Temperature of engine oil
      *
@@ -433,7 +446,7 @@ enum VehicleProperty: int32_t {
      * Parking brake state.
      *
      * @change_mode VehiclePropertyChangeMode:ON_CHANGE
-     * @access VehiclePropertyAccess:READ
+     * @access VehiclePropertyAccess:READ_WRITE
      */
     PARKING_BRAKE_ON = (
         0x0402
@@ -441,6 +454,18 @@ enum VehicleProperty: int32_t {
         | VehiclePropertyType:BOOLEAN
         | VehicleArea:GLOBAL),
 
+    /**
+     * Auto-apply parking brake.
+     *
+     * @change_mode VehiclePropertyChangeMode:ON_CHANGE
+     * @access VehiclePropertyAccess:READ_WRITE
+     */
+    PARKING_BRAKE_AUTO_APPLY = (
+        0x0403
+        | VehiclePropertyGroup:SYSTEM
+        | VehiclePropertyType:BOOLEAN
+        | VehicleArea:GLOBAL),
+
     /**
      * Driving status policy.
      *
@@ -1861,6 +1886,17 @@ enum VehicleHvacFanDirection : int32_t {
     DEFROST = 0x4,
 };
 
+enum VehicleOilLevel : int32_t {
+    /**
+     * Oil level values
+     */
+    CRITICALLY_LOW = 0,
+    LOW = 1,
+    NORMAL = 2,
+    HIGH = 3,
+    ERROR = 4,
+};
+
 /**
  * Constants relevant to radio.
  */