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

Commit 2e1be911 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 am: 6dd38449 

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



Change-Id: I9e4ab9310b2d5195e0cd86eae5c7ec2d0c5bda31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76d0f140 6dd38449

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