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

Commit 6ff664e1 authored by Antonio Kantek's avatar Antonio Kantek Committed by Automerger Merge Worker
Browse files

Merge "Update CustomInputType functions comment" am: 3d008424 

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



Change-Id: Ia6ceef0dd32416aae1eb51902342f33f0e9b3ccc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e39f2f1 3d008424

automotive/vehicle/2.0/types.hal

+6 −7
Original line number Diff line number Diff line
@@ -1632,10 +1632,8 @@ enum VehicleProperty : int32_t { 
     *

     * The Android properties are:

     *

     * int32Values[0] : Input code identifying the function representing this event. Valid event

     *                  types are defined by CustomInputType.CUSTOM_EVENT_F1 up to

     *                  CustomInputType.CUSTOM_EVENT_F10. They represent the custom event to be

     *                  defined by OEM partners.

     * int32Values[0] : Input code identifying the function representing this event. OEMs are free

     *                  to use any signed 32 bits number to represent the input code value.

     * int32Values[1] : target display type defined in VehicleDisplay. Events not tied to specific

     *                  display must be sent to VehicleDisplay#MAIN.

     * int32Values[2] : repeat counter, if 0 then event is not repeated. Values 1 or above means
@@ -5326,10 +5324,11 @@ enum ProcessTerminationReason : int32_t { 
 */

enum CustomInputType : int32_t {

    /**

     * Ten functions representing the custom input code to be defined and implemented by OEM

     * partners.

     * Ten optional function codes to be used in case OEM don't need more than 10 input code values.

     *

     * OEMs need to formally contact Android team if more than 10 functions are required.

     * OEMs are free to use any signed 32 bits number to represent the input code value.

     * The following function keys are only for convenience and any other integer values are

     * also allowed.

     */

    CUSTOM_EVENT_F1 = 1001,

    CUSTOM_EVENT_F2 = 1002,

current.txt

+3 −0
Original line number Diff line number Diff line
@@ -929,4 +929,7 @@ b7ce2d87841585551b082fca6d099622e63b7099e0d8013f687ea1a1dc35c4dc android.hardwar 
1bac6a7c8136dfb0414fe5639eec115aa2d12927e64a0642a43fb53225f099b2 android.hardware.wifi@1.6::IWifiStaIface

0a800e010e8eb6eecdfdc96f04fd2ae2f417a79a74a7c0eec3a9f539199bccd4 android.hardware.wifi@1.6::types



# ABI preserving changes to HALs during Android U

2aa559cda86c358c6429114ef6bc72c1b43281e98f9eb6b4df5e7073c8d05767 android.hardware.automotive.vehicle@2.0::types



# There will be no more HIDL HALs. Use AIDL instead.