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

Commit 1b7b2b4b authored by Rahul Arya's avatar Rahul Arya Committed by Gerrit Code Review
Browse files

Merge "Ignore SDP replies while discovery is inactive"

parents af190f9f 7b669bf7

system/bta/dm/bta_dm_main.cc

+12 −3
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          bta_dm_close_gatt_conn(message);

          break;

        default:

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

                   bta_dm_search_cb.state);

      }

      break;

    case BTA_DM_SEARCH_ACTIVE:
@@ -89,9 +92,6 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
        case BTA_DM_REMT_NAME_EVT:

          bta_dm_rmt_name(message);

          break;

        case BTA_DM_SDP_RESULT_EVT:

          bta_dm_sdp_result(message);

          break;

        case BTA_DM_SEARCH_CMPL_EVT:

          bta_dm_search_cmpl();

          break;
@@ -104,6 +104,9 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        default:

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

                   bta_dm_search_cb.state);

      }

      break;

    case BTA_DM_SEARCH_CANCELLING:
@@ -123,6 +126,9 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
          bta_dm_search_cancel_notify();

          bta_dm_execute_queued_request();

          break;

        default:

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

                   bta_dm_search_cb.state);

      }

      break;

    case BTA_DM_DISCOVER_ACTIVE:
@@ -145,6 +151,9 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
        case BTA_DM_API_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        default:

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

                   bta_dm_search_cb.state);

      }

      break;

  }