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

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

Use explicit state bta_dm_gattc_callback::BTA_GATTC_SEARCH_CMPL_EVT am:... 

Use explicit state bta_dm_gattc_callback::BTA_GATTC_SEARCH_CMPL_EVT am: d8a217dc am: 6f180477 am: 8d9d94c5

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



Change-Id: Iaf595cfb029e67e0306cdf07a3aa67e9a3d30c06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1009be90 8d9d94c5

system/bta/dm/bta_dm_act.cc

+10 −3
Original line number Diff line number Diff line
@@ -4546,10 +4546,17 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
      break;



    case BTA_GATTC_SEARCH_CMPL_EVT:

      if (bta_dm_search_get_state() != BTA_DM_SEARCH_IDLE)

      switch (bta_dm_search_get_state()) {

        case BTA_DM_SEARCH_IDLE:

          break;

        case BTA_DM_SEARCH_ACTIVE:

        case BTA_DM_SEARCH_CANCELLING:

        case BTA_DM_DISCOVER_ACTIVE:

          bta_dm_gatt_disc_complete(p_data->search_cmpl.conn_id,

                                    p_data->search_cmpl.status);

          break;

      }

      break;



    case BTA_GATTC_CLOSE_EVT:

      LOG_INFO("BTA_GATTC_CLOSE_EVT reason = %d", p_data->close.reason);