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

Commit 70fa01e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean-up BTIF profile queue on profile shutdown" into oc-mr1-dev

parents df5266f9 c6918f4e

system/btif/Android.bp

+22 −0
Original line number Diff line number Diff line
@@ -120,3 +120,25 @@ cc_test { 
    ],

    cflags: ["-DBUILDCFG"],

}



// btif profile queue unit tests for target

// ========================================================

cc_test {

    name: "net_test_btif_profile_queue",

    defaults: ["fluoride_defaults"],

    include_dirs: btifCommonIncludes,

    srcs: [

      "src/btif_profile_queue.cc",

      "test/btif_profile_queue_test.cc"

    ],

    shared_libs: [

        "liblog",

        "libhardware",

        "libcutils",

    ],

    static_libs: [

        "libbluetooth-types",

        "libosi",

    ],

    cflags: ["-DBUILDCFG"],

}

system/btif/include/btif_profile_queue.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ typedef bt_status_t (*btif_connect_cb_t)(RawAddress* bda, uint16_t uuid); 


bt_status_t btif_queue_connect(uint16_t uuid, const RawAddress* bda,

                               btif_connect_cb_t connect_cb);

void btif_queue_cleanup(uint16_t uuid);

void btif_queue_advance();

bt_status_t btif_queue_connect_next(void);

void btif_queue_release();

system/btif/src/btif_av.cc

+2 −0
Original line number Diff line number Diff line
@@ -1410,6 +1410,7 @@ static void cleanup(int service_uuid) { 
static void cleanup_src(void) {

  BTIF_TRACE_EVENT("%s", __func__);



  btif_queue_cleanup(UUID_SERVCLASS_AUDIO_SOURCE);

  if (bt_av_src_callbacks) {

    bt_av_src_callbacks = NULL;

    if (bt_av_sink_callbacks == NULL) cleanup(BTA_A2DP_SOURCE_SERVICE_ID);
@@ -1419,6 +1420,7 @@ static void cleanup_src(void) { 
static void cleanup_sink(void) {

  BTIF_TRACE_EVENT("%s", __func__);



  btif_queue_cleanup(UUID_SERVCLASS_AUDIO_SINK);

  if (bt_av_sink_callbacks) {

    bt_av_sink_callbacks = NULL;

    if (bt_av_src_callbacks == NULL) cleanup(BTA_A2DP_SINK_SERVICE_ID);

system/btif/src/btif_hf.cc

+1 −0
Original line number Diff line number Diff line
@@ -1494,6 +1494,7 @@ bool btif_hf_call_terminated_recently() { 
static void cleanup(void) {

  BTIF_TRACE_EVENT("%s", __func__);



  btif_queue_cleanup(UUID_SERVCLASS_AG_HANDSFREE);

  if (bt_hf_callbacks) {

#if (defined(BTIF_HF_SERVICES) && (BTIF_HF_SERVICES & BTA_HFP_SERVICE_MASK))

    btif_disable_service(BTA_HFP_SERVICE_ID);

system/btif/src/btif_hf_client.cc

+1 −0
Original line number Diff line number Diff line
@@ -704,6 +704,7 @@ static bt_status_t request_last_voice_tag_number(const RawAddress* bd_addr) { 
static void cleanup(void) {

  BTIF_TRACE_EVENT("%s", __func__);



  btif_queue_cleanup(UUID_SERVCLASS_HF_HANDSFREE);

  if (bt_hf_client_callbacks) {

    btif_disable_service(BTA_HFP_HS_SERVICE_ID);

    bt_hf_client_callbacks = NULL;