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

Commit 9eebeba9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix compile warnings in btm_sco_hfp_hal_linux.cc" into main am: 9d9867d4 am: d473e6b0 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3144977



Change-Id: I5b39f94f7a97202c969eb7ffeca9d993b2f1637f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 781ab07f d473e6b0

system/stack/btm/btm_sco_hfp_hal_linux.cc

+3 −3
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ constexpr uint16_t HCI_DEV_NONE = 0xffff; 
int btsocket_open_mgmt(uint16_t hci) {

  int fd = socket(PF_BLUETOOTH, SOCK_RAW | SOCK_NONBLOCK, BTPROTO_HCI);

  if (fd < 0) {

    log::debug("Failed to open BT socket.");

    log::debug("Failed to open BT socket, hci: %u", hci);

    return -errno;

  }
@@ -364,7 +364,7 @@ bool enable_offload(bool enable) { 


static bool get_single_codec(int codec, bt_codec** out) {

  for (cached_codec_info& c : cached_codecs) {

    if (c.inner.codec == codec) {

    if (c.inner.codec == static_cast<uint64_t>(codec)) {

      *out = &c.inner;

      return true;

    }
@@ -443,7 +443,7 @@ void set_codec_datapath(tBTA_AG_UUID_CODEC codec_uuid) { 


size_t get_packet_size(int codec) {

  for (const cached_codec_info& c : cached_codecs) {

    if (c.inner.codec == codec) {

    if (c.inner.codec == static_cast<uint64_t>(codec)) {

      return c.pkt_size;

    }

  }