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

Commit d4aedcc3 authored by Jayden Kim's avatar Jayden Kim
Browse files

Import contexthub v4 for endpoint ID on offload socket context 

Bug: 342012881
Bug: 367419086
Test: m com.android.btservices
Change-Id: Ibca52daef3e2702be709f9bce9aa14896235c3e1
parent 3b15d68f

system/gd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ cc_defaults { 
                "android.hardware.bluetooth-V1-ndk",

                "android.hardware.bluetooth.ranging-V2-ndk",

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

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

            ],

        },

    },

system/gd/hal/socket_hal_android.cc

+2 −2
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ protected: 
            .socketId = static_cast<int64_t>(context.socket_id),

            .name = context.name,

            .aclConnectionHandle = context.acl_connection_handle,

            .hubId = static_cast<int64_t>(context.endpoint_info.hub_id),

            .endpointId = static_cast<int64_t>(context.endpoint_info.endpoint_id),

            .endpointId.id = static_cast<int64_t>(context.endpoint_info.endpoint_id),

            .endpointId.hubId = static_cast<int64_t>(context.endpoint_info.hub_id),

    };

    if (std::holds_alternative<hal::LeCocChannelInfo>(context.channel_info)) {

      auto& le_coc_context = std::get<hal::LeCocChannelInfo>(context.channel_info);