Commit: 235e738f20c7c3c52828ff7ec1789be7237b6999 - system-bt (git)

system/bt

Commit MetaInfo

• Revision: 235e738f20c7c3c52828ff7ec1789be7237b6999 (tree)
• Zeit: 2017-05-18 15:26:18
• Autor: Jakub Pawlowski <jpawlowski@goog...>
• Commiter: Jakub Pawlowski

Log Message

Protect concurrent access to local state used during BLE scanning

Make sure that all access happens on jni thread

Bug: 38298938
Test: Code compilation
Change-Id: I38246626d2c6390586b314b27889dd9ba905f406
(cherry picked from commit eb43e9cf12139aeb227e26a8201a80974129c553)

Ändern Zusammenfassung

• modified: btif/src/btif_ble_scanner.cc

Diff

--- a/btif/src/btif_ble_scanner.cc
+++ b/btif/src/btif_ble_scanner.cc
@@ -83,6 +83,7 @@ struct equal_to<bt_bdaddr_t> {
 
 namespace {
 
+// all access to this variable should be done on the jni thread
 std::unordered_set<bt_bdaddr_t> p_dev_cb;
 
 void btif_gattc_add_remote_bdaddr(BD_ADDR p_bda, uint8_t addr_type) {
@@ -258,15 +259,20 @@ class BleScannerInterfaceImpl : public BleScannerInterface {
   }
 
   void Scan(bool start) override {
-    if (!start) {
-      do_in_bta_thread(FROM_HERE, Bind(&BTA_DmBleObserve, false, 0, nullptr));
-      return;
-    }
-
-    btif_gattc_init_dev_cb();
-    do_in_bta_thread(FROM_HERE,
-                     Bind(&BTA_DmBleObserve, true, 0,
-                          (tBTA_DM_SEARCH_CBACK*)bta_scan_results_cb));
+    do_in_jni_thread(Bind(
+        [](bool start) {
+          if (!start) {
+            do_in_bta_thread(FROM_HERE,
+                             Bind(&BTA_DmBleObserve, false, 0, nullptr));
+            return;
+          }
+
+          btif_gattc_init_dev_cb();
+          do_in_bta_thread(FROM_HERE,
+                           Bind(&BTA_DmBleObserve, true, 0,
+                                (tBTA_DM_SEARCH_CBACK*)bta_scan_results_cb));
+        },
+        start));
   }
 
   void ScanFilterParamSetup(