commit e14e2f5f5be524f98c3ce2829339a5091e0eac4d
author Josh Wu <joshwu@google.com> Mon Aug 22 23:10:24 2022 +0800
committer Jack He <siyuanh@google.com> Tue Aug 23 21:52:45 2022 +0000
tree af91a133129fbdd6e985c0d124c9906a508b85be
parent c6f62aee02214d75323fba8f51086d681d0d591c

Fix EIR UUID cache crash

Tag: #stability
Test: atest BluetoothInstrumentationTests
Test: avatar
Bug: 243380633
Bug: 242350646
Change-Id: I86c9058995efb22029f2f7840c4b9d0052a6230b

system/btif/src/btif_dm.cc

diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index b6e6eac..ee6c2f2 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -1466,6 +1466,7 @@
               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();
@@ -1475,7 +1476,6 @@
             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