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

Commit 7c85fbfa authored by Michael Benfield's avatar Michael Benfield Committed by Automerger Merge Worker
Browse files

Merge "Floss: Fix unused but set variables." am: 9150e42d am: f4f4bc3f am:... 

Merge "Floss: Fix unused but set variables." am: 9150e42d am: f4f4bc3f am: 977a851e am: cf70b8dd

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



Change-Id: I6832657ecedb641b6a484833189af06f72733e2b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd101627 cf70b8dd

system/btif/src/btif_storage.cc

+1 −1
Original line number Diff line number Diff line
@@ -1943,6 +1943,7 @@ void btif_storage_load_bonded_leaudio_has_devices() { 
        !btif_config_exist(name, HAS_FEATURES))

      continue;



#ifndef TARGET_FLOSS

    int value;

    uint16_t is_acceptlisted = 0;

    if (btif_config_get_int(name, HAS_IS_ACCEPTLISTED, &value))
@@ -1951,7 +1952,6 @@ void btif_storage_load_bonded_leaudio_has_devices() { 
    uint8_t features = 0;

    if (btif_config_get_int(name, HAS_FEATURES, &value)) features = value;



#ifndef TARGET_FLOSS

    do_in_main_thread(FROM_HERE, Bind(&le_audio::has::HasClient::AddFromStorage,

                                      bd_addr, features, is_acceptlisted));

#else

system/gd/hal/hci_hal_host.cc

+0 −4
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ int waitHciDev(int hci_interface) { 
  struct pollfd fds[1];

  struct mgmt_pkt ev;

  int fd;

  int ret = 0;



  fd = socket(PF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);

  if (fd < 0) {
@@ -128,11 +127,9 @@ int waitHciDev(int hci_interface) { 
    WRITE_NO_INTR(n = poll(fds, 1, -1));

    if (n == -1) {

      LOG_ERROR("Poll error: %s", strerror(errno));

      ret = -1;

      break;

    } else if (n == 0) {

      LOG_ERROR("Timeout, no HCI device detected");

      ret = -1;

      break;

    }
@@ -140,7 +137,6 @@ int waitHciDev(int hci_interface) { 
      WRITE_NO_INTR(n = read(fd, &ev, sizeof(struct mgmt_pkt)));

      if (n < 0) {

        LOG_ERROR("Error reading control channel: %s", strerror(errno));

        ret = -1;

        break;

      }