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

Commit edf64e6a authored by Liang Li's avatar Liang Li Committed by Automerger Merge Worker
Browse files

Merge "Notify socket disconnection event to socket hal for offload RFCOMM... 

Merge "Notify socket disconnection event to socket hal for offload RFCOMM socket" into main am: 7d8d8eda

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



Change-Id: I1d72b6ca0a745699c18dd0609791b685f0bc32ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59cd80a7 7d8d8eda

system/btif/src/btif_sock_rfc.cc

+8 −0
Original line number Diff line number Diff line
@@ -545,6 +545,14 @@ static void cleanup_rfc_slot(rfc_slot_t* slot) { 
            slot->role ? slot->service_name : slot->service_uuid.ToString().c_str());



    slot->fd = INVALID_FD;



    if (com::android::bluetooth::flags::socket_settings_api()) {

      if (slot->data_path == BTSOCK_DATA_PATH_HARDWARE_OFFLOAD && !slot->f.server &&

          slot->socket_id != 0) {

        bluetooth::shim::GetLppOffloadManager()->SocketClosed(slot->socket_id);

        slot->socket_id = 0;

      }

    }

  }



  if (slot->app_fd != INVALID_FD) {