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

Commit 51ac59bb authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Fix EIR UUID cache crash" into tm-d1-dev am: 983a5437 

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



Change-Id: Id4c8ced4f53dc246b357872992117ccda049fc32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db002298 983a5437

system/btif/src/btif_dm.cc

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

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

                                    uuid_128bit.end());

                                    uuid_128bit.end());

            }

            }

            eir_uuids_cache.erase(uuids_iter);

          }

          }

          if (num_eir_uuids > 0) {

          if (num_eir_uuids > 0) {

            prop.val = (void*)property_value.data();

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

            prop.val = &uuid;

            prop.len = Uuid::kNumBytes128;

            prop.len = Uuid::kNumBytes128;

          }

          }

          eir_uuids_cache.erase(uuids_iter);

        }

        }

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

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

        // it is not already cleared

        // it is not already cleared