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

Commit c8931851 authored by Martin Brabham's avatar Martin Brabham
Browse files

GD Security: pipe in determined just_works flag 

Bug: 162984360
Tag: #gd-refactor
Test: cert/run --host SecurityTest
Test: atest --host bluetooth_test_gd
Change-Id: I480898445bf65f8034a1519cc3fba4572e613c56
parent 09e304f3

system/main/shim/btm_api.cc

+3 −3
Original line number Diff line number Diff line
@@ -350,14 +350,12 @@ class ShimUi : public bluetooth::security::UI { 
          bluetooth::ToRawAddress(address.GetAddress());

      user_cfm_req_evt_data.cfm_req.num_val = numeric_value;

      // If we pop a dialog then it isn't just_works

      user_cfm_req_evt_data.cfm_req.just_works = false;

      user_cfm_req_evt_data.cfm_req.just_works = data.IsJustWorks();



      address_name_map_.emplace(address, legacy_name);

      memcpy((char*)user_cfm_req_evt_data.cfm_req.bd_name, legacy_name.name,

             BD_NAME_LEN);



      // TODO(optedoblivion): BTA needs a callback for when just works auto

      // accepted (i.e. =true)

      (*bta_callbacks_->p_sp_callback)(BTM_SP_CFM_REQ_EVT,

                                       &user_cfm_req_evt_data);

    }
@@ -365,11 +363,13 @@ class ShimUi : public bluetooth::security::UI { 


  void DisplayConfirmValue(bluetooth::security::ConfirmationData data) {

    waiting_for_pairing_prompt_ = false;

    data.SetJustWorks(false);

    HandleConfirm(data);

  }



  void DisplayYesNoDialog(bluetooth::security::ConfirmationData data) {

    waiting_for_pairing_prompt_ = false;

    data.SetJustWorks(true);

    HandleConfirm(data);

  }