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

Commit 906c59b0 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Remove unused smp_proc_init" am: 509d28cd 

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



Change-Id: Ie66a661ced04b4167047cd2e8b69f5437b3df8b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4f35115 509d28cd

system/stack/smp/smp_act.cc

+0 −17
Original line number Diff line number Diff line
@@ -672,23 +672,6 @@ void smp_proc_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  p_cb->flags |= SMP_PAIR_FLAGS_CMD_CONFIRM;

}



/** process pairing initializer from peer device */

void smp_proc_init(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {

  uint8_t* p = p_data->p_data;



  SMP_TRACE_DEBUG("%s", __func__);



  if (smp_command_has_invalid_parameters(p_cb)) {

    tSMP_INT_DATA smp_int_data;

    smp_int_data.status = SMP_INVALID_PARAMETERS;

    smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);

    return;

  }



  /* save the SRand for comparison */

  STREAM_TO_ARRAY(p_cb->rrand.data(), p, OCTET16_LEN);

}



/*******************************************************************************

 * Function     smp_proc_rand

 * Description  process pairing random (nonce) from peer device

system/test/mock/mock_stack_smp_act.cc

+0 −5
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ struct smp_proc_sec_grant smp_proc_sec_grant; 
struct smp_proc_pair_fail smp_proc_pair_fail;

struct smp_proc_pair_cmd smp_proc_pair_cmd;

struct smp_proc_confirm smp_proc_confirm;

struct smp_proc_init smp_proc_init;

struct smp_proc_rand smp_proc_rand;

struct smp_process_pairing_public_key smp_process_pairing_public_key;

struct smp_process_pairing_commitment smp_process_pairing_commitment;
@@ -211,10 +210,6 @@ void smp_proc_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  inc_func_call_count(__func__);

  test::mock::stack_smp_act::smp_proc_confirm(p_cb, p_data);

}

void smp_proc_init(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {

  inc_func_call_count(__func__);

  test::mock::stack_smp_act::smp_proc_init(p_cb, p_data);

}

void smp_proc_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {

  inc_func_call_count(__func__);

  test::mock::stack_smp_act::smp_proc_rand(p_cb, p_data);

system/test/mock/mock_stack_smp_act.h

+1 −9
Original line number Diff line number Diff line
@@ -227,15 +227,7 @@ struct smp_proc_confirm { 
  void operator()(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { body(p_cb, p_data); };

};

extern struct smp_proc_confirm smp_proc_confirm;

// Name: smp_proc_init

// Params: tSMP_CB* p_cb, tSMP_INT_DATA* p_data

// Returns: void

struct smp_proc_init {

  std::function<void(tSMP_CB* p_cb, tSMP_INT_DATA* p_data)> body{

      [](tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {}};

  void operator()(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { body(p_cb, p_data); };

};

extern struct smp_proc_init smp_proc_init;



// Name: smp_proc_rand

// Params: tSMP_CB* p_cb, tSMP_INT_DATA* p_data

// Returns: void