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

Commit 243358e6 authored by Pradeep Panigrahi's avatar Pradeep Panigrahi Committed by Nitin Shivpure
Browse files

Bluetooth: fix sniff issue with multiple rfcomm connection in same ACL 

When there are multiple rfcomm connection with same appid and peer bd
address, we were clearing jv pm control block in addition to closing
connection to service with registered app id. Since appid is common
across all the client and server app registed to jv. we were clearing
entire connection to service for this appid and peer bdadres which was
corrupting sniff logic, when another rfcomm connection exists with same
peer bdaddress. So avoiding closing of connection to the service when
multiple rfcomm connection exists in same ACL.

Change-Id: Id71ef5f7f0e00f1bda3b70a4826c31bef46caafc
parent 7d99c254

system/bta/jv/bta_jv_act.c

+23 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static tBTA_JV_STATUS bta_jv_free_set_pm_profile_cb(UINT32 jv_handle) 
{

    tBTA_JV_STATUS status = BTA_JV_FAILURE;

    tBTA_JV_PM_CB  **p_cb;

    int i;

    int i, j, bd_counter = 0, appid_counter = 0;



    for (i = 0; i < BTA_JV_PM_MAX_NUM; i++)

    {
@@ -456,10 +456,31 @@ static tBTA_JV_STATUS bta_jv_free_set_pm_profile_cb(UINT32 jv_handle) 
        if ((bta_jv_cb.pm_cb[i].state != BTA_JV_PM_FREE_ST) &&

                (jv_handle == bta_jv_cb.pm_cb[i].handle))

        {

            for (j = 0; j < BTA_JV_PM_MAX_NUM; j++)

            {

                if (bdcmp(bta_jv_cb.pm_cb[j].peer_bd_addr, bta_jv_cb.pm_cb[i].peer_bd_addr) == 0)

                    bd_counter++;

                if (bta_jv_cb.pm_cb[j].app_id == bta_jv_cb.pm_cb[i].app_id)

                    appid_counter++;

            }



            APPL_TRACE_API3("bta_jv_free_set_pm_profile_cb(jv_handle: 0x%2x), idx: %d, "

                    "app_id: 0x%x", jv_handle, i, bta_jv_cb.pm_cb[i].app_id);

            APPL_TRACE_API2("bta_jv_free_set_pm_profile_cb, bd_counter = %d, "

                    "appid_counter = %d", bd_counter, appid_counter);

            if (bd_counter > 1)

            {

                bta_jv_pm_conn_idle(&bta_jv_cb.pm_cb[i]);

            }



            if (bd_counter <= 1 || (appid_counter <= 1))

            {

                bta_jv_clear_pm_cb(&bta_jv_cb.pm_cb[i], TRUE);

            }

            else

            {

                bta_jv_clear_pm_cb(&bta_jv_cb.pm_cb[i], FALSE);

            }



            if (BTA_JV_RFCOMM_MASK & jv_handle)

            {