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

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

Merge "Import contexthub v4 for endpoint ID on offload socket context" into main am: 9d35625c

parents 191ca129 9d35625c
Loading
Loading
Loading
Loading
+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",
            ],
        },
    },
+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);