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

Commit fc9e09be authored by Jayden Kim's avatar Jayden Kim Committed by Automerger Merge Worker
Browse files

Merge "Import contexthub v4 from bluetooth socket hal" into main am: 408d387e 

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



Change-Id: I98dc9571f30a4630c4513ddd2c62ef3a860f72b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09b80bd5 408d387e

bluetooth/socket/aidl/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -26,8 +26,14 @@ aidl_interface { 
    vendor_available: true,

    host_supported: true,

    srcs: ["android/hardware/bluetooth/socket/*.aidl"],

    imports: [

        "android.hardware.contexthub-V4",

    ],

    stability: "vintf",

    backend: {

        java: {

            enabled: false,

        },

        ndk: {

            apex_available: [

                "//apex_available:platform",

bluetooth/socket/aidl/aidl_api/android.hardware.bluetooth.socket/current/android/hardware/bluetooth/socket/SocketContext.aidl

+1 −2
Original line number Diff line number Diff line
@@ -38,6 +38,5 @@ parcelable SocketContext { 
  String name;

  int aclConnectionHandle;

  android.hardware.bluetooth.socket.ChannelInfo channelInfo;

  long hubId;

  long endpointId;

  android.hardware.contexthub.EndpointId endpointId;

}

bluetooth/socket/aidl/android/hardware/bluetooth/socket/SocketContext.aidl

+3 −7
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.bluetooth.socket;



import android.hardware.bluetooth.socket.ChannelInfo;

import android.hardware.contexthub.EndpointId;



/**

 * Socket context.
@@ -48,12 +49,7 @@ parcelable SocketContext { 
    ChannelInfo channelInfo;



    /**

     * The ID of the Hub to which the end point belongs for hardware offload data path.

     * Unique identifier for an endpoint at the hardware offload data path.

     */

    long hubId;



    /**

     * The ID of the Hub endpoint for hardware offload data path.

     */

    long endpointId;

    EndpointId endpointId;

}

bluetooth/socket/aidl/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ cc_fuzz { 
    ],

    static_libs: [

        "android.hardware.bluetooth.socket-V1-ndk",

        "android.hardware.contexthub-V4-ndk",

        "liblog",

    ],

    fuzz_config: {

bluetooth/socket/aidl/vts/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ cc_test { 
    ],

    static_libs: [

        "android.hardware.bluetooth.socket-V1-ndk",

        "android.hardware.contexthub-V4-ndk",

        "libbluetooth-types",

    ],

    test_suites: [