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

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

Merge changes from topics "engine_auto_idle_stop_enabled", "seat_walk_in_pos" 

* changes:
  Added ENGINE_IDLE_AUTO_STOP_ENABLED to hardware layer.
  Added SEAT_WALK_IN_POS to hardware layer.
parents 7ee56e8f 83914478

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

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ enum VehicleProperty { 
  RANGE_REMAINING = 291504904,

  TIRE_PRESSURE = 392168201,

  CRITICALLY_LOW_TIRE_PRESSURE = 392168202,

  ENGINE_IDLE_AUTO_STOP_ENABLED = 287310624,

  GEAR_SELECTION = 289408000,

  CURRENT_GEAR = 289408001,

  PARKING_BRAKE_ON = 287310850,
@@ -165,6 +166,7 @@ enum VehicleProperty { 
  SEAT_CUSHION_SIDE_SUPPORT_MOVE = 356518816,

  SEAT_LUMBAR_VERTICAL_POS = 356518817,

  SEAT_LUMBAR_VERTICAL_MOVE = 356518818,

  SEAT_WALK_IN_POS = 356518819,

  SEAT_OCCUPANCY = 356518832,

  WINDOW_POS = 322964416,

  WINDOW_MOVE = 322964417,

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

+32 −0
Original line number Diff line number Diff line
@@ -440,6 +440,17 @@ enum VehicleProperty { 
     */

    CRITICALLY_LOW_TIRE_PRESSURE = 0x030A + 0x10000000 + 0x07000000

            + 0x00600000, // VehiclePropertyGroup:SYSTEM,VehicleArea:WHEEL,VehiclePropertyType:FLOAT

    /**

     * Represents feature for engine idle automatic stop.

     *

     * If true, the vehicle may automatically shut off the engine when it is not needed and then

     * automatically restart it when needed.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     */

    ENGINE_IDLE_AUTO_STOP_ENABLED =

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

    /**

     * Currently selected gear

     *
@@ -1911,6 +1922,27 @@ enum VehicleProperty { 
     */

    SEAT_LUMBAR_VERTICAL_MOVE =

            0x0BA2 + VehiclePropertyGroup.SYSTEM + VehicleArea.SEAT + VehiclePropertyType.INT32,

    /**

     * Represents property that indicates the current walk-in position of the seat.

     *

     * The maxInt32Value and minInt32Value in VehicleAreaConfig must be defined.

     * The minInt32Value must be 0.

     * All integers between minInt32Value and maxInt32Value must be supported.

     *

     * minInt32Value indicates the normal seat position.

     * maxInt32Value indicates the seat is in the full walk-in position.

     *

     * Values in between minInt32Value and maxInt32Value indicate a transition state between the

     * normal and walk-in positions.

     *

     * The area ID must match the seat that actually moves when the walk-in feature activates, not

     * the intended seat the passengers will sit in.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     */

    SEAT_WALK_IN_POS =

            0x0BA3 + VehiclePropertyGroup.SYSTEM + VehicleArea.SEAT + VehiclePropertyType.INT32,

    /**

     * Seat Occupancy

     *

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

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::RANGE_REMAINING, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::TIRE_PRESSURE, VehiclePropertyAccess::READ},

        {VehicleProperty::CRITICALLY_LOW_TIRE_PRESSURE, VehiclePropertyAccess::READ},

        {VehicleProperty::ENGINE_IDLE_AUTO_STOP_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::GEAR_SELECTION, VehiclePropertyAccess::READ},

        {VehicleProperty::CURRENT_GEAR, VehiclePropertyAccess::READ},

        {VehicleProperty::PARKING_BRAKE_ON, VehiclePropertyAccess::READ},
@@ -165,6 +166,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_MOVE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_LUMBAR_VERTICAL_POS, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_LUMBAR_VERTICAL_MOVE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_WALK_IN_POS, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_OCCUPANCY, VehiclePropertyAccess::READ},

        {VehicleProperty::WINDOW_POS, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::WINDOW_MOVE, VehiclePropertyAccess::READ_WRITE},

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

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::RANGE_REMAINING, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::TIRE_PRESSURE, VehiclePropertyChangeMode::CONTINUOUS},

        {VehicleProperty::CRITICALLY_LOW_TIRE_PRESSURE, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::ENGINE_IDLE_AUTO_STOP_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::GEAR_SELECTION, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::CURRENT_GEAR, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::PARKING_BRAKE_ON, VehiclePropertyChangeMode::ON_CHANGE},
@@ -165,6 +166,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_MOVE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_LUMBAR_VERTICAL_POS, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_LUMBAR_VERTICAL_MOVE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_WALK_IN_POS, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_OCCUPANCY, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::WINDOW_POS, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::WINDOW_MOVE, VehiclePropertyChangeMode::ON_CHANGE},

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

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.RANGE_REMAINING, VehiclePropertyAccess.READ_WRITE),

        Map.entry(VehicleProperty.TIRE_PRESSURE, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.CRITICALLY_LOW_TIRE_PRESSURE, VehiclePropertyAccess.READ),

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

        Map.entry(VehicleProperty.GEAR_SELECTION, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.CURRENT_GEAR, VehiclePropertyAccess.READ),

        Map.entry(VehicleProperty.PARKING_BRAKE_ON, VehiclePropertyAccess.READ),
@@ -157,6 +158,7 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.SEAT_CUSHION_SIDE_SUPPORT_MOVE, VehiclePropertyAccess.READ_WRITE),

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

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

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

        Map.entry(VehicleProperty.SEAT_OCCUPANCY, VehiclePropertyAccess.READ),

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

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