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

Commit 0dc7ba0d authored by Aaqib Ismail's avatar Aaqib Ismail
Browse files

Add HAL changes for STEERING_WHEEL_LIGHTS_STATE 

Bug: 257268085
Test: atest VtsHalAutomotiveVehicle_TargetTest
      atest CtsCarTestCases:CarPropertyManagerTest
      atest CtsCarTestCases:VehiclePropertyIdsTest
Change-Id: I64cbf203e806b8f74b8e26c68273da5a21bf4070
parent c79b1bd0

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

  READING_LIGHTS_STATE = 356519683,

  READING_LIGHTS_SWITCH = 356519684,

  STEERING_WHEEL_LIGHTS_STATE = 289410828,

  SUPPORT_CUSTOMIZE_VENDOR_PERMISSION = 287313669,

  DISABLED_OPTIONAL_FEATURES = 286265094,

  INITIAL_USER_INFO = 299896583,

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

+21 −0
Original line number Diff line number Diff line
@@ -2413,6 +2413,27 @@ 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,

    /**

     * Support customize permissions for vendor properties

     *

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

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 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::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

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 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::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

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ 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.SUPPORT_CUSTOMIZE_VENDOR_PERMISSION, VehiclePropertyAccess.READ),

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

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