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

Commit 3a04b761 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "BTM_ReadRSSI is async and returns BTM_CMD_STARTED on success" into main... 

Merge "BTM_ReadRSSI is async and returns BTM_CMD_STARTED on success" into main am: d1a83afb am: a7f3adab

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



Change-Id: If7afe1200e5bbcbc1936492888b486cd00924a4b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4cb1c4ff a7f3adab

system/bta/hearing_aid/hearing_aid.cc

+1 −1
Original line number Diff line number Diff line
@@ -1973,7 +1973,7 @@ private: 
        device->num_intervals_since_last_rssi_read = 0;

        log::debug("bd_addr={}", device->address);

        if (get_btm_client_interface().link_controller.BTM_ReadRSSI(

                    device->address, read_rssi_callback) != BTM_SUCCESS) {

                    device->address, read_rssi_callback) != BTM_CMD_STARTED) {

          log::warn("Unable to read RSSI peer:{}", device->address);

        }

      }

system/btif/src/btif_gatt_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ static bt_status_t btif_gattc_read_remote_rssi(int client_if, const RawAddress& 
  return do_in_jni_thread(base::Bind(

          [](int client_if, const RawAddress& bd_addr) {

            if (get_btm_client_interface().link_controller.BTM_ReadRSSI(

                        bd_addr, btm_read_rssi_cb) != BTM_SUCCESS) {

                        bd_addr, btm_read_rssi_cb) != BTM_CMD_STARTED) {

              log::warn("Unable to read RSSI peer:{} client_if:{}", bd_addr, client_if);

            }

          },