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

Commit 8c6aad82 authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by Android (Google) Code Review
Browse files

Merge changes I685873b0,Iac3078fa into qt-qpr1-dev 

* changes:
  HF_Client: Send BTA_HF_CLIENT_RFC_CLOSE_EVT when client_cb == NULL
  HF_Client: Free the RFC if the handle doesn't match
parents 0003c00a f148cb1c

system/bta/hf_client/bta_hf_client_rfc.cc

+5 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ static void bta_hf_client_mgmt_cback(uint32_t code, uint16_t port_handle) { 
    } else {

      APPL_TRACE_ERROR("%s: PORT_SUCCESS, ignoring handle = %d", __func__,

                       port_handle);

      osi_free(p_buf);

      return;

    }

  } else if (client_cb != NULL &&
@@ -136,6 +137,10 @@ static void bta_hf_client_mgmt_cback(uint32_t code, uint16_t port_handle) { 


    RFCOMM_RemoveServer(port_handle);

    p_buf->hdr.event = BTA_HF_CLIENT_RFC_CLOSE_EVT;

  } else if (client_cb == NULL) {

    // client_cb is already cleaned due to hfp client disabled.

    // Assigned a valid event value to header and send this message anyway.

    p_buf->hdr.event = BTA_HF_CLIENT_RFC_CLOSE_EVT;

  }



  p_buf->hdr.layer_specific = client_cb != NULL ? client_cb->handle : 0;