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

Commit c1dc5a44 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "EIR uuids should be added to device_found_cb"" am: 7db3be5f 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1842933

Change-Id: Ife68579e40a13f5fa3869c6821224b553da692df
parents 6e04f209 7db3be5f

system/btif/src/btif_dm.cc

+8 −21
Original line number Diff line number Diff line
@@ -1155,8 +1155,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 
      /* inquiry result */

      bt_bdname_t bdname;

      uint8_t remote_name_len;

      uint8_t num_uuids = 0, max_num_uuid = 32;

      uint8_t uuid_list[32 * Uuid::kNumBytes16];

      tBTA_SERVICE_MASK services = 0;



      p_search_data->inq_res.remt_name_not_required =

          check_eir_remote_name(p_search_data, NULL, NULL);
@@ -1170,11 +1169,14 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 
      if (!check_eir_remote_name(p_search_data, bdname.name, &remote_name_len))

        check_cached_remote_name(p_search_data, bdname.name, &remote_name_len);



      /* Check EIR for services */

      /* Check EIR for remote name and services */

      if (p_search_data->inq_res.p_eir) {

        BTM_GetEirUuidList(p_search_data->inq_res.p_eir,

                           p_search_data->inq_res.eir_len, Uuid::kNumBytes16,

                           &num_uuids, uuid_list, max_num_uuid);

        BTA_GetEirService(p_search_data->inq_res.p_eir,

                          p_search_data->inq_res.eir_len, &services);

        BTIF_TRACE_DEBUG("%s()EIR BTA services = %08X", __func__,

                         (uint32_t)services);

        /* TODO:  Get the service list and check to see which uuids we got and

         * send it back to the client. */

      }



      {
@@ -1242,21 +1244,6 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 
                                   &(p_search_data->inq_res.include_rsi));

        num_properties++;



        /* EIR queried services */

        if (num_uuids > 0) {

          uint16_t* p_uuid16 = (uint16_t*)uuid_list;

          std::vector<Uuid> uuid128_list;

          for (int i = 0; i < num_uuids; ++i) {

            Uuid uuid = Uuid::From16Bit(p_uuid16[i]);

            uuid128_list.push_back(uuid);

          }



          BTIF_STORAGE_FILL_PROPERTY(

              &properties[num_properties], BT_PROPERTY_UUIDS,

              num_uuids * Uuid::kNumBytes128, uuid128_list.data());

          num_properties++;

        }



        status =

            btif_storage_add_remote_device(&bdaddr, num_properties, properties);

        ASSERTC(status == BT_STATUS_SUCCESS,