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

Commit 0e6dd66c authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Ensure that pairing state is reset at the end of GATT service discovery." am: b1ad7a8c 

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



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

system/btif/src/btif_dm.cc

+8 −12
Original line number Diff line number Diff line
@@ -1795,6 +1795,14 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
          }

          pairing_cb.gatt_over_le =

              btif_dm_pairing_cb_t::ServiceDiscoveryState::FINISHED;



          if (pairing_cb.sdp_over_classic !=

              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.

            LOG_INFO("clearing pairing_cb");

            pairing_cb = {};

          }

        }

      } else {

        LOG_INFO("New GATT over SDP UUIDs for %s:",
@@ -1864,18 +1872,6 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
      /* Send the event to the BTIF */

      GetInterfaceToProfiles()->events->invoke_remote_device_properties_cb(

          BT_STATUS_SUCCESS, bd_addr, num_properties, prop);



      if ((bd_addr == pairing_cb.bd_addr ||

           bd_addr == pairing_cb.static_bdaddr) &&

          pairing_cb.sdp_over_classic !=

              btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED &&

          pairing_cb.gatt_over_le !=

              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.

        LOG_INFO("clearing pairing_cb");

        pairing_cb = {};

      }

    } break;



    case BTA_DM_DID_RES_EVT: {