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

Commit fff1a253 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Ensure that Numeric Comparison pairing is not treated as Just Works am: eaef6ea9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18185797



Change-Id: Ib465de886f37fdf49bc0d3b08460ba5a2fc39119
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6011a01f eaef6ea9

system/stack/btm/btm_sec.cc

+7 −3
Original line number Diff line number Diff line
@@ -2780,12 +2780,16 @@ void btm_proc_sp_req_evt(tBTM_SP_EVT event, const uint8_t* p) { 
            BTM_ConfirmReqReply(status, p_bda);

            return;

          }

          if ((p_dev_rec->rmt_io_caps == BTM_IO_CAP_IO) &&



          if ((p_dev_rec->rmt_io_caps == BTM_IO_CAP_IO ||

               p_dev_rec->rmt_io_caps == BTM_IO_CAP_OUT) &&

              (btm_cb.devcb.loc_io_caps == BTM_IO_CAP_IO) &&

              ((p_dev_rec->rmt_auth_req & BTM_AUTH_SP_YES) ||

               (btm_cb.devcb.loc_auth_req & BTM_AUTH_SP_YES))) {

            /* Both devices are DisplayYesNo and one or both devices want to

               authenticate -> use authenticated link key */

            /* Use Numeric Comparison if

             * 1. Local IO capability is DisplayYesNo,

             * 2. Remote IO capability is DisplayOnly or DiaplayYesNo, and

             * 3. Either of the devices have requested authenticated link key */

            evt_data.cfm_req.just_works = false;

          }

        }