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

Commit 9144b64c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Assign pairing code to bta_dm_cb before device name resolution"

parents bb2ed405 23790f91

system/bta/dm/bta_dm_act.cc

+4 −3
Original line number Diff line number Diff line
@@ -2882,6 +2882,8 @@ static uint8_t bta_dm_sp_cback (tBTM_SP_EVT event, tBTM_SP_EVT_DATA *p_data) 
    /*case BTM_SP_KEY_REQ_EVT: */

    case BTM_SP_KEY_NOTIF_EVT:

#endif

        bta_dm_cb.num_val = sec_event.key_notif.passkey = p_data->key_notif.passkey;



        if(BTM_SP_CFM_REQ_EVT == event)

        {

          /* Due to the switch case falling through below to BTM_SP_KEY_NOTIF_EVT,
@@ -2907,7 +2909,6 @@ static uint8_t bta_dm_sp_cback (tBTM_SP_EVT event, tBTM_SP_EVT_DATA *p_data) 
           }

        }



        bta_dm_cb.num_val = sec_event.key_notif.passkey = p_data->key_notif.passkey;

        if (BTM_SP_KEY_NOTIF_EVT == event)

        {

            /* If the device name is not known, save bdaddr and devclass