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

Commit 6667ce1f authored by Nitin Shivpure's avatar Nitin Shivpure Committed by Matthew Xie
Browse files

Bluetooth: Cleaning up pan_conn DB, if connection is not successful. - do not merge 

A case where DUT is paired with remoteDeviceA &  remoteDeviceB.
remoteDeviceA is not pagable(turned off or some other reason).
DUT(PANU) try to connect remoteDeviceA(NAP). But connection is
unsuccessful, Because remoteDeviceA is not pagable, In this scenario
btpan_conn Database is not cleaning up at btif layer. Later
remoteDeviceB(PANU) connect to DUT(NAP) & connection is succesful,
When remoteDeviceB disconnect existing connection. As database
still has remoteDeviceA BD address at Btif layer. remoteDeviceA
BD address is passed instead of remoteDeviceB BD address from Btif
to UI. So remoteDeviceB still shows connected on UI. Cleaning up
pan_conn database for particular pan connection at BTIF layer,
whichever connection is not successful will solve this issue.

Change-Id: I31dfe3ef46295e74bbfb57563e4fd4fc7155f006
parent c32779e2

system/bta/pan/bta_pan_act.c

+6 −7
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ void bta_pan_open(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data) 


    status = PAN_Connect (p_data->api_open.bd_addr, p_data->api_open.local_role, p_data->api_open.peer_role,

                        &p_scb->handle);



    APPL_TRACE_DEBUG("%s pan connect status: %d", __func__, status);



    if(status == PAN_SUCCESS)

    {
@@ -545,6 +545,8 @@ void bta_pan_conn_open(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data) 


    tBTA_PAN_OPEN data;



    APPL_TRACE_DEBUG("%s pan connection result: %d", __func__, p_data->conn.result);



    bdcpy(data.bd_addr, p_scb->bd_addr);

    data.handle = p_scb->handle;

    data.local_role = p_scb->local_role;
@@ -554,7 +556,9 @@ void bta_pan_conn_open(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data) 
    {

        data.status = BTA_PAN_SUCCESS;

        bta_pan_co_open(p_scb->handle, p_scb->app_id, p_scb->local_role, p_scb->peer_role, p_scb->bd_addr);



        p_scb->pan_flow_enable = TRUE;

        p_scb->app_flow_enable = TRUE;

        bta_sys_conn_open(BTA_ID_PAN ,p_scb->app_id, p_scb->bd_addr);

    }

    else

    {
@@ -562,11 +566,6 @@ void bta_pan_conn_open(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data) 
        data.status = BTA_PAN_FAIL;

    }



    p_scb->pan_flow_enable = TRUE;

    p_scb->app_flow_enable = TRUE;



    bta_sys_conn_open( BTA_ID_PAN ,p_scb->app_id, p_scb->bd_addr);



    bta_pan_cb.p_cback(BTA_PAN_OPEN_EVT, (tBTA_PAN *)&data);

system/btif/src/btif_pan.c

+4 −1
Original line number Diff line number Diff line
@@ -617,6 +617,9 @@ static void bta_pan_callback_transfer(UINT16 event, char *p_param) 
                /*         p_data->open.bd_addr[3], p_data->open.bd_addr[4], p_data->open.bd_addr[5]); */

                btpan_connection_state_t state;

                bt_status_t status;

                btpan_conn_t *conn = btpan_find_conn_handle(p_data->open.handle);



                ALOGV("%s pan connection open status: %d", __func__, p_data->open.status);

                if(p_data->open.status == BTA_PAN_SUCCESS)

                {

                    state = BTPAN_STATE_CONNECTED;
@@ -626,8 +629,8 @@ static void bta_pan_callback_transfer(UINT16 event, char *p_param) 
                {

                    state = BTPAN_STATE_DISCONNECTED;

                    status = BT_STATUS_FAIL;

                    btpan_cleanup_conn(conn);

                }

                btpan_conn_t* conn = btpan_find_conn_handle(p_data->open.handle);

                /* debug("BTA_PAN_OPEN_EVT handle:%d, conn:%p",  p_data->open.handle, conn); */

                /* debug("conn bta local_role:%d, bta remote role:%d", conn->local_role, conn->remote_role); */

                int btpan_conn_local_role = bta_role_to_btpan(p_data->open.local_role);