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

Commit ebc80e53 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android Git Automerger
Browse files

am 0cee7cbf: Merge "DO NOT MERGE BLE Secuity manager state machine generate... 

am 0cee7cbf: Merge "DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event." into klp-dev

* commit '0cee7cbf':
  DO NOT MERGE BLE Secuity manager state machine generate wrong pairing success event.
parents 2a81e965 0cee7cbf

system/stack/smp/smp_act.c

+3 −4
Original line number Diff line number Diff line
@@ -905,10 +905,9 @@ void smp_delay_terminate(tSMP_CB *p_cb, tSMP_INT_DATA *p_data) 


    btu_stop_timer (&p_cb->rsp_timer_ent);



    /* if remote user terminate connection, finish SMP pairing as normal */

    if (p_data->reason == HCI_ERR_PEER_USER)

        p_cb->status = SMP_SUCCESS;

    else

    /* if remote user terminate connection, keep the previous status */

    /* this is to avoid reporting reverse status to uplayer */

    if (p_data->reason != HCI_ERR_PEER_USER)

        p_cb->status = SMP_CONN_TOUT;



    smp_proc_pairing_cmpl(p_cb);