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

Commit c216044d authored by Josh Wu's avatar Josh Wu Committed by Qasim Javed
Browse files

Fix EIR UUID cache crash 

Tag: #stability
Test: atest BluetoothInstrumentationTests
Test: avatar
Bug: 243380633
Bug: 242350646

Merged-In: I86c9058995efb22029f2f7840c4b9d0052a6230b
Change-Id: I86c9058995efb22029f2f7840c4b9d0052a6230b
parent 8ae054be

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -1479,6 +1479,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();
@@ -1488,7 +1489,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