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

Commit 21e10507 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix EIR UUID cache crash"

parents 32997225 c216044d

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -1486,6 +1486,7 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
              property_value.insert(property_value.end(), uuid_128bit.begin(),

                                    uuid_128bit.end());

            }

            eir_uuids_cache.erase(uuids_iter);

          }

          if (num_eir_uuids > 0) {

            prop.val = (void*)property_value.data();
@@ -1495,7 +1496,6 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
            prop.val = &uuid;

            prop.len = Uuid::kNumBytes128;

          }

          eir_uuids_cache.erase(uuids_iter);

        }

        // Both SDP and bonding are done, clear pairing control block in case

        // it is not already cleared