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

Commit 29aacc5c authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes I30d3ca74,I0d647e75,I29f580cf into main am: 86fed914 am: 9d57dbea 

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



Change-Id: If21a5629fb42a78a0353737add63eb29f5b9b3a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d555bede 9d57dbea

system/gd/os/linux_generic/reactor.cc

+3 −2
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ void Reactor::Run() { 
    epoll_event events[kEpollMaxEvents];

    int count;

    RUN_NO_INTR(count = epoll_wait(epoll_fd_, events, kEpollMaxEvents, timeout_ms));

    ASSERT(count != -1);

    ASSERT_LOG(count != -1, "epoll_wait failed: fd=%d, err=%s",

               epoll_fd_, strerror(errno));

    if (waiting_for_idle && count == 0) {

      timeout_ms = -1;

      waiting_for_idle = false;
@@ -244,7 +245,7 @@ void Reactor::Unregister(Reactor::Reactable* reactable) { 
    if (result == -1 && errno == ENOENT) {

      LOG_INFO("reactable is invalid or unregistered");

    } else {

      ASSERT(result != -1);

      ASSERT_LOG(result != -1, "could not unregister epoll fd: %s", strerror(errno));

    }



    // If we are unregistering during the callback event from this reactable, we delete it after the callback is

system/stack/gatt/gatt_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ tGATTC_TryMtuRequestResult GATTC_TryMtuRequest(const RawAddress& remote_bda, 
                                               tBT_TRANSPORT transport,

                                               uint16_t conn_id,

                                               uint16_t* current_mtu) {

  log::info("{} conn_id=0x{:04x}", remote_bda.ToString(), conn_id);

  log::info("{} conn_id=0x{:04x}", ADDRESS_TO_LOGGABLE_STR(remote_bda), conn_id);

  *current_mtu = GATT_DEF_BLE_MTU_SIZE;



  if (transport == BT_TRANSPORT_BR_EDR) {