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

Commit 45408cdb authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Fix pairing multiple devices in a row" am: aa6e5868 am: f4a7f13d 

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



Change-Id: Ibb127533c8c3d2cbab6788344c62a93c10b974c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0bfa984e f4a7f13d

system/btif/src/btif_dm.cc

+2 −5
Original line number Diff line number Diff line
@@ -1726,11 +1726,8 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
              btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED) {

        // Both SDP and bonding are either done, or not scheduled, we are safe

        // to clear the service discovery part of CB.

        pairing_cb.gatt_over_le =

            btif_dm_pairing_cb_t::ServiceDiscoveryState::NOT_STARTED;

        pairing_cb.sdp_over_classic =

            btif_dm_pairing_cb_t::ServiceDiscoveryState::NOT_STARTED;

        LOG_INFO("clearing service discovery part of pairing_cb");

        LOG_INFO("clearing pairing_cb");

        pairing_cb = {};

      }

    } break;