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

Commit 6dd38449 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove devices only in the main thread" into main am: fde407b0 

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



Change-Id: I03ccd633d9654ea440dcf931e38c501160c5dd3c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2d222f0 fde407b0

system/bta/dm/bta_dm_sec_api.cc

+6 −1
Original line number Diff line number Diff line
@@ -119,10 +119,15 @@ void BTA_DmAddDevice(RawAddress bd_addr, DEV_CLASS dev_class, LinkKey link_key, 
/** This function removes a device from the security database list of peer

 * device. It manages unpairing even while connected */

tBTA_STATUS BTA_DmRemoveDevice(const RawAddress& bd_addr) {

  if (!com::android::bluetooth::flags::remove_device_in_main_thread()) {

    bta_dm_remove_device(bd_addr);

    return BTA_SUCCESS;

  }



  do_in_main_thread(base::BindOnce(bta_dm_remove_device, bd_addr));

  return BTA_SUCCESS;

}



/*******************************************************************************

 *

 * Function         BTA_DmAddBleKey