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

Commit 8151b3c1 authored by Yu Shan's avatar Yu Shan Committed by Automerger Merge Worker
Browse files

Merge "Fixed spelling mistake in LaneCenteringAssistCommand" into main am:... 

Merge "Fixed spelling mistake in LaneCenteringAssistCommand" into main am: 5df990f7 am: c231cfb6

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2890071



Change-Id: I6b9f35eb6530ac915def56ebc4d362838b50ce92
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9edfcbea c231cfb6

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

+3 −3
Original line number Diff line number Diff line
@@ -4625,11 +4625,11 @@ enum VehicleProperty { 
     *

     * Commands to activate and suspend LCA.

     *

     * When the command ACTIVATE from LaneCenteringAssistCommmand is sent,

     * When the command ACTIVATE from LaneCenteringAssistCommand is sent,

     * LANE_CENTERING_ASSIST_STATE must be set to LaneCenteringAssistState#ACTIVATION_REQUESTED.

     * When the ACTIVATE command succeeds, LANE_CENTERING_ASSIST_STATE must be set to

     * LaneCenteringAssistState#ACTIVATED. When the command DEACTIVATE from

     * LaneCenteringAssistCommmand succeeds, LANE_CENTERING_ASSIST_STATE must be set to

     * LaneCenteringAssistCommand succeeds, LANE_CENTERING_ASSIST_STATE must be set to

     * LaneCenteringAssistState#ENABLED.

     *

     * For the global area ID (0), the VehicleAreaConfig#supportedEnumValues must be defined unless
@@ -4645,7 +4645,7 @@ enum VehicleProperty { 
     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.WRITE

     * @data_enum LaneCenteringAssistCommmand

     * @data_enum LaneCenteringAssistCommand

     */

    LANE_CENTERING_ASSIST_COMMAND =

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