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

Commit adb85f11 authored by Chienyuan Huang's avatar Chienyuan Huang Committed by Automerger Merge Worker
Browse files

Merge "api: GetConnectionState OR state of resolved address" into main am:... 

Merge "api: GetConnectionState OR state of resolved address" into main am: c3aa1ff8 am: 28599121

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



Change-Id: I97c8130e92fd65cfe2c15ae07f3001dca7fd0662
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03cfb518 28599121

system/btif/src/btif_dm.cc

+3 −2
Original line number Diff line number Diff line
@@ -957,11 +957,12 @@ uint16_t btif_dm_get_connection_state_sync(const RawAddress& bd_addr) { 
             base::BindOnce(

                 [](const RawAddress bd_addr, std::promise<uint16_t> promise) {

                   // Experiment to try with maybe resolved address

                   btif_dm_get_resolved_connection_state({

                   uint16_t state = btif_dm_get_resolved_connection_state({

                       .type = BLE_ADDR_RANDOM,

                       .bda = bd_addr,

                   });

                   promise.set_value(btif_dm_get_connection_state(bd_addr));

                   state |= btif_dm_get_connection_state(bd_addr);

                   promise.set_value(state);

                 },

                 bd_addr, std::move(promise))));

  return future.get();