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

Commit b038dab2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes I685873b0,Iac3078fa am: 3687b15f am: 3e7835bb 

Change-Id: Idf233abd54bbb373acf653015e3b21cad5f787ae
parents b4417a17 3e7835bb

system/bta/hf_client/bta_hf_client_rfc.cc

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

    } else {

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

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

                       port_handle);

                       port_handle);

      osi_free(p_buf);

      return;

      return;

    }

    }

  } else if (client_cb != NULL &&

  } 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);

    RFCOMM_RemoveServer(port_handle);

    p_buf->hdr.event = BTA_HF_CLIENT_RFC_CLOSE_EVT;

    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;

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