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

Commit 07952f18 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Re-log bta::dm::bta_dm_search_sm_execute with text am: b62172bd 

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



Change-Id: Ib425d7f71e349caaa86e73001eb9657471e12b01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a64b304c b62172bd

system/bta/dm/bta_dm_main.cc

+16 −10
Original line number Diff line number Diff line
@@ -58,8 +58,10 @@ void bta_dm_search_sm_disable() { bta_sys_deregister(BTA_ID_DM_SEARCH); } 
 *

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

bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) {

  LOG_INFO("bta_dm_search_sm_execute state:%d, event:0x%x",

           bta_dm_search_get_state(), p_msg->event);

  const tBTA_DM_EVT event = static_cast<tBTA_DM_EVT>(p_msg->event);

  LOG_INFO("state:%s, event:%s[0x%x]",

           bta_dm_state_text(bta_dm_search_get_state()).c_str(),

           bta_dm_event_text(event).c_str(), event);



  tBTA_DM_MSG* message = (tBTA_DM_MSG*)p_msg;

  switch (bta_dm_search_get_state()) {
@@ -84,8 +86,9 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
          bta_dm_close_gatt_conn(message);

          break;

        default:

          LOG_INFO("Received unexpected event 0x%x in state %d", p_msg->event,

                   bta_dm_search_get_state());

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

    case BTA_DM_SEARCH_ACTIVE:
@@ -111,8 +114,9 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
          bta_dm_search_cancel();

          break;

        default:

          LOG_INFO("Received unexpected event 0x%x in state %d", p_msg->event,

                   bta_dm_search_get_state());

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

    case BTA_DM_SEARCH_CANCELLING:
@@ -144,8 +148,9 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
          }

          [[fallthrough]];

        default:

          LOG_INFO("Received unexpected event 0x%x in state %d", p_msg->event,

                   bta_dm_search_get_state());

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

    case BTA_DM_DISCOVER_ACTIVE:
@@ -181,8 +186,9 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
          }

          [[fallthrough]];

        default:

          LOG_INFO("Received unexpected event 0x%x in state %d", p_msg->event,

                   bta_dm_search_get_state());

          LOG_INFO("Received unexpected event %s[0x%x] in state %s",

                   bta_dm_event_text(event).c_str(), event,

                   bta_dm_state_text(bta_dm_search_get_state()).c_str());

      }

      break;

  }