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

Commit a378df04 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi
Browse files

floss: Fix scoping of property vector for eir 

Fix the scoping of the vector that holds the eir uuids for the uuid
property. Previously, it was going out of scope and corrupting the
reported uuid values.

Bug: 245794678
Tag: #floss
Test: Manual test on ChromeOS.
Change-Id: I339580d6885336971511484ad1c39c099bcf4c75
parent 958a575a

system/btif/src/btif_dm.cc

+24 −18
Original line number Diff line number Diff line
@@ -1331,6 +1331,18 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 
                                   &(p_search_data->inq_res.include_rsi));

        num_properties++;



        // Floss expects that EIR uuids are immediately reported when the

        // device is found and doesn't wait for the pairing intent.

        //

        // If a subsequent SDP is completed, the new UUIDs should replace

        // the existing UUIDs.

#if TARGET_FLOSS

        bool report_eir_uuids = true;

#else

        bool report_eir_uuids = false;

#endif

        // Scope needs to persist until `invoke_device_found_cb` below.

        std::vector<uint8_t> property_value;

        /* Cache EIR queried services */

        if (num_uuids > 0) {

          uint16_t* p_uuid16 = (uint16_t*)uuid_list;
@@ -1346,25 +1358,19 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 
            uuid_iter->second.insert(uuid);

          }



#if TARGET_FLOSS

          std::vector<uint8_t> property_value;

          if (report_eir_uuids) {

            for (auto uuid : uuid_iter->second) {

              auto uuid_128bit = uuid.To128BitBE();

              property_value.insert(property_value.end(), uuid_128bit.begin(),

                                    uuid_128bit.end());

            }



          // Floss expects that EIR uuids are immediately reported when the

          // device is found and doesn't wait for the pairing intent.

          //

          // If a subsequent SDP is completed, the new UUIDs should replace the

          // existing UUIDs.

            BTIF_STORAGE_FILL_PROPERTY(

                &properties[num_properties], BT_PROPERTY_UUIDS,

                uuid_iter->second.size() * Uuid::kNumBytes128,

                (void*)property_value.data());

            num_properties++;

#endif

          }

        }



        // Floss needs appearance for metrics purposes