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

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

Merge changes from topics "seat_cushion_side_support_pos", "seat_easy_access_enabled" 

* changes:
  Added SEAT_CUSHION_SIDE_SUPPORT_POS to hardware layer.
  Added SEAT_EASY_ACCESS_ENABLED to hardware layer.
parents da433e03 802ecb52

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
@@ -155,6 +155,8 @@ enum VehicleProperty { 
  SEAT_HEADREST_ANGLE_MOVE = 356518808,

  SEAT_HEADREST_FORE_AFT_POS = 356518809,

  SEAT_HEADREST_FORE_AFT_MOVE = 356518810,

  SEAT_EASY_ACCESS_ENABLED = 354421661,

  SEAT_CUSHION_SIDE_SUPPORT_POS = 356518815,

  SEAT_OCCUPANCY = 356518832,

  WINDOW_POS = 322964416,

  WINDOW_MOVE = 322964417,

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

+27 −0
Original line number Diff line number Diff line
@@ -1721,6 +1721,33 @@ enum VehicleProperty { 
     */

    SEAT_HEADREST_FORE_AFT_MOVE = 0x0B9A + 0x10000000 + 0x05000000

            + 0x00400000, // VehiclePropertyGroup:SYSTEM,VehicleArea:SEAT,VehiclePropertyType:INT32

    /**

     * Represents property for Seat easy access feature.

     *

     * If true, the seat will automatically adjust to make it easier for the occupant to enter and

     * exit the vehicle.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     */

    SEAT_EASY_ACCESS_ENABLED =

            0x0B9D + VehiclePropertyGroup.SYSTEM + VehicleArea.SEAT + VehiclePropertyType.BOOLEAN,

    /**

     * Represents property for seat’s hipside (bottom cushion’s side) support position.

     *

     * The maxInt32Value and minInt32Value in VehicleAreaConfig must be defined. All integers

     * between minInt32Value and maxInt32Value are supported.

     *

     * maxInt32Value indicates the widest cushion side support setting (i.e. least support).

     * minInt32Value indicates the thinnest cushion side support setting (i.e most support).

     *

     * This value is not in any particular unit but in a specified range of steps.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     */

    SEAT_CUSHION_SIDE_SUPPORT_POS =

            0x0B9F + 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
@@ -155,6 +155,8 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::SEAT_HEADREST_ANGLE_MOVE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_HEADREST_FORE_AFT_POS, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_HEADREST_FORE_AFT_MOVE, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_EASY_ACCESS_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_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
@@ -155,6 +155,8 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::SEAT_HEADREST_ANGLE_MOVE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_HEADREST_FORE_AFT_POS, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_HEADREST_FORE_AFT_MOVE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_EASY_ACCESS_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_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
@@ -147,6 +147,8 @@ public final class AccessForVehicleProperty { 
        Map.entry(VehicleProperty.SEAT_HEADREST_ANGLE_MOVE, VehiclePropertyAccess.READ_WRITE),

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

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

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

        Map.entry(VehicleProperty.SEAT_CUSHION_SIDE_SUPPORT_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),