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

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

Merge "Added SEAT_AIRBAG_ENABLED to hardware layer."

parents b9dca29e b96e3766

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

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ enum VehicleProperty { 
  SEAT_HEADREST_FORE_AFT_POS = 356518809,

  SEAT_HEADREST_FORE_AFT_MOVE = 356518810,

  SEAT_EASY_ACCESS_ENABLED = 354421661,

  SEAT_AIRBAG_ENABLED = 354421662,

  SEAT_CUSHION_SIDE_SUPPORT_POS = 356518815,

  SEAT_CUSHION_SIDE_SUPPORT_MOVE = 356518816,

  SEAT_LUMBAR_VERTICAL_POS = 356518817,

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

+13 −0
Original line number Diff line number Diff line
@@ -1732,6 +1732,19 @@ enum VehicleProperty { 
     */

    SEAT_EASY_ACCESS_ENABLED =

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

    /**

     * Represents feature to enable/disable a seat's ability to deploy airbag(s) when triggered

     * (e.g. by a crash).

     *

     * If true, it means the seat's airbags are enabled, and if triggered (e.g. by a crash), they

     * will deploy. If false, it means the seat's airbags are disabled, and they will not deploy

     * under any circumstance. This property does not indicate if the airbags are deployed or not.

     *

     * This property can be set to VehiclePropertyAccess.READ read only for the sake of regulation

     * or safety concerns.

     */

    SEAT_AIRBAG_ENABLED =

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

    /**

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

     *

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

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {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_AIRBAG_ENABLED, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_POS, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_MOVE, VehiclePropertyAccess::READ_WRITE},

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

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

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {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_AIRBAG_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_POS, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SEAT_CUSHION_SIDE_SUPPORT_MOVE, VehiclePropertyChangeMode::ON_CHANGE},

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

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

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ public final class AccessForVehicleProperty { 
        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_AIRBAG_ENABLED, VehiclePropertyAccess.READ_WRITE),

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

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

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