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

Commit 440d12a7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "btm_history: Output only if state has changed" am: 86eb0415 

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

Change-Id: I6e04986f54077afc2c2c6ce78b0187cb6e45d6d1
parents ec4eb654 86eb0415

system/stack/btm/btm_sec.cc

+6 −4
Original line number Diff line number Diff line
@@ -4554,10 +4554,12 @@ static void btm_sec_change_pairing_state(tBTM_PAIRING_STATE new_state) { 
            btm_pair_state_descr(btm_cb.pairing_state),

            btm_pair_state_descr(new_state), btm_cb.pairing_flags);



  BTM_LogHistory(

      kBtmLogTag, btm_cb.pairing_bda, "Pairing state changed",

      base::StringPrintf("%s => %s", btm_pair_state_descr(btm_cb.pairing_state),

  if (btm_cb.pairing_state != new_state) {

    BTM_LogHistory(kBtmLogTag, btm_cb.pairing_bda, "Pairing state changed",

                   base::StringPrintf(

                       "%s => %s", btm_pair_state_descr(btm_cb.pairing_state),

                       btm_pair_state_descr(new_state)));

  }

  btm_cb.pairing_state = new_state;



  if (new_state == BTM_PAIR_STATE_IDLE) {

system/stack/smp/smp_main.cc

+12 −0
Original line number Diff line number Diff line
@@ -25,6 +25,12 @@ 


#include "osi/include/log.h"



namespace {



constexpr char kBtmLogTag[] = "SMP";



}



const char* const smp_state_name[] = {

    "SMP_STATE_IDLE",

    "SMP_STATE_WAIT_APP_RSP",
@@ -937,6 +943,12 @@ void smp_set_state(tSMP_STATE state) { 
    SMP_TRACE_DEBUG("State change: %s(%d) ==> %s(%d)",

                    smp_get_state_name(smp_cb.state), smp_cb.state,

                    smp_get_state_name(state), state);

    if (smp_cb.state != state) {

      BTM_LogHistory(

          kBtmLogTag, smp_cb.pairing_ble_bd_addr, "Security state changed",

          base::StringPrintf("%s => %s", smp_get_state_name(smp_cb.state),

                             smp_get_state_name(state)));

    }

    smp_cb.state = state;

  } else {

    SMP_TRACE_DEBUG("smp_set_state invalid state =%d", state);