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

Commit ad4b8246 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Prevent premature freeing of queued GATT command" into main am: 70ce9f05 

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



Change-Id: Idecd1c38885425918ce4a0f1f4cab672ef53473f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ead54ee 70ce9f05

system/bta/gatt/bta_gattc_act.cc

+3 −1
Original line number Diff line number Diff line
@@ -972,7 +972,9 @@ void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB* p_clcb, 
     * want to free the underlying buffer that's being

     * referenced by p_clcb->p_q_cmd

     */

    if (p_q_cmd != p_clcb->p_q_cmd) osi_free_and_reset((void**)&p_q_cmd);

    if (!bta_gattc_is_data_queued(p_clcb, p_q_cmd)) {

      osi_free_and_reset((void**)&p_q_cmd);

    }

  } else {

    bta_gattc_continue(p_clcb);

  }