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

Commit 95aca271 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "btif: Return after closing the socket" into qt-dev am: 61c7e561 am:... 

Merge "btif: Return after closing the socket" into qt-dev am: 61c7e561 am: b6e151e6 am: 96dede7b

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13486155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee3bb154833c4d4ae979f31271dc10b82f96f806
parents fe657aa9 96dede7b

system/btif/src/btif_sock_l2cap.cc

+2 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ static void on_l2cap_data_ind(tBTA_JV* evt, uint32_t id) { 
               << ": unable to push data to socket - closing  fixed channel";

      BTA_JvL2capCloseLE(sock->handle);

      btsock_l2cap_free_l(sock);

      return;

    }



  } else {
@@ -744,6 +745,7 @@ static void on_l2cap_data_ind(tBTA_JV* evt, uint32_t id) { 
                   << ": unable to push data to socket - closing channel";

          BTA_JvL2capClose(sock->handle);

          btsock_l2cap_free_l(sock);

          return;

        }

      }

    }