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

Commit ca76c73c authored by Aaqib Ismail's avatar Aaqib Ismail Committed by Android (Google) Code Review
Browse files

Merge changes from topics "SteeringWheelLightsState", "SteeringWheelLightsSwitch" 

* changes:
  Add HAL changes for STEERING_WHEEL_LIGHTS_SWITCH
  Add HAL changes for STEERING_WHEEL_LIGHTS_STATE
parents d131df67 4b8688ff

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
@@ -196,6 +196,8 @@ enum VehicleProperty { 
  CABIN_LIGHTS_SWITCH = 289410818,

  READING_LIGHTS_STATE = 356519683,

  READING_LIGHTS_SWITCH = 356519684,

  STEERING_WHEEL_LIGHTS_STATE = 289410828,

  STEERING_WHEEL_LIGHTS_SWITCH = 289410829,

  SUPPORT_CUSTOMIZE_VENDOR_PERMISSION = 287313669,

  DISABLED_OPTIONAL_FEATURES = 286265094,

  INITIAL_USER_INFO = 299896583,

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

+42 −0
Original line number Diff line number Diff line
@@ -2436,6 +2436,48 @@ enum VehicleProperty { 
     */

    READING_LIGHTS_SWITCH = 0x0F04 + 0x10000000 + 0x05000000

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

    /**

     * Steering wheel lights state

     *

     * Represents the current state of the steering wheel lights. This is different from

     * STEERING_WHEEL_LIGHTS_SWITCH which represents the position of the switch controlling

     * the lights. Therefore, STEERING_WHEEL_LIGHTS_STATE may not match the value of

     * STEERING_WHEEL_LIGHTS_SWITCH (e.g. STEERING_WHEEL_LIGHTS_SWITCH=AUTOMATIC and

     * STEERING_WHEEL_LIGHTS_STATE=ON).

     *

     * This property should only be implemented if STEERING_WHEEL_LIGHTS_STATE's value may be

     * different from that of CABIN_LIGHTS_STATE.

     *

     * For the global area ID (0), the VehicleAreaConfig#supportedEnumValues must be defined unless

     * all enum values of VehicleLightState are supported.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ

     * @data_enum VehicleLightState

     */

    STEERING_WHEEL_LIGHTS_STATE =

            0x0F0C + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,

    /**

     * Steering wheel lights switch

     *

     * Represents the position of the switch controlling the steering wheel lights. This is

     * different from STEERING_WHEEL_LIGHTS_STATE which represents the current state of the steering

     * wheel lights. Therefore, STEERING_WHEEL_LIGHTS_SWITCH may not match the value of

     * STEERING_WHEEL_LIGHTS_STATE (e.g. STEERING_WHEEL_LIGHTS_SWITCH=AUTOMATIC and

     * STEERING_WHEEL_LIGHTS_STATE=ON).

     *

     * This property should only be implemented if STEERING_WHEEL_LIGHTS_SWITCH's value may be

     * different from that of CABIN_LIGHTS_SWITCH.

     *

     * For the global area ID (0), the VehicleAreaConfig#supportedEnumValues must be defined unless

     * all enum values of VehicleLightSwitch are supported.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ_WRITE

     * @data_enum VehicleLightSwitch

     */

    STEERING_WHEEL_LIGHTS_SWITCH =

            0x0F0D + VehiclePropertyGroup.SYSTEM + VehicleArea.GLOBAL + VehiclePropertyType.INT32,

    /**

     * Support customize permissions for vendor properties

     *

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

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,8 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope 
        {VehicleProperty::CABIN_LIGHTS_SWITCH, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::READING_LIGHTS_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::READING_LIGHTS_SWITCH, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::STEERING_WHEEL_LIGHTS_STATE, VehiclePropertyAccess::READ},

        {VehicleProperty::STEERING_WHEEL_LIGHTS_SWITCH, VehiclePropertyAccess::READ_WRITE},

        {VehicleProperty::SUPPORT_CUSTOMIZE_VENDOR_PERMISSION, VehiclePropertyAccess::READ},

        {VehicleProperty::DISABLED_OPTIONAL_FEATURES, VehiclePropertyAccess::READ},

        {VehicleProperty::INITIAL_USER_INFO, VehiclePropertyAccess::READ_WRITE},

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

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,8 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi 
        {VehicleProperty::CABIN_LIGHTS_SWITCH, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::READING_LIGHTS_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::READING_LIGHTS_SWITCH, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::STEERING_WHEEL_LIGHTS_STATE, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::STEERING_WHEEL_LIGHTS_SWITCH, VehiclePropertyChangeMode::ON_CHANGE},

        {VehicleProperty::SUPPORT_CUSTOMIZE_VENDOR_PERMISSION, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::DISABLED_OPTIONAL_FEATURES, VehiclePropertyChangeMode::STATIC},

        {VehicleProperty::INITIAL_USER_INFO, VehiclePropertyChangeMode::ON_CHANGE},

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

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

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

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

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

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

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

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

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