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

Commit bef85a13 authored by Chris Manton's avatar Chris Manton
Browse files

Check read local name internal API return codes 

Bug: 340961849
Test: m .
Flag: EXEMPT, Logging Change

Change-Id: Ie40ef2b76d4cdc0fc1632c2946f89d6f77a29b11
parent a5f33b0a

system/btif/src/bluetooth.cc

+5 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 
#include "device/include/interop_config.h"

#include "internal_include/bt_target.h"

#include "main/shim/dumpsys.h"

#include "os/log.h"

#include "os/parameter_provider.h"

#include "osi/include/alarm.h"

#include "osi/include/allocator.h"
@@ -104,6 +103,7 @@ 
#include "stack/include/a2dp_api.h"

#include "stack/include/avdt_api.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/hfp_lc3_decoder.h"

#include "stack/include/hfp_lc3_encoder.h"

#include "stack/include/hfp_msbc_decoder.h"
@@ -1357,7 +1357,10 @@ void invoke_oob_data_request_cb(tBT_TRANSPORT t, bool valid, Octet16 c, 
  log::info("");

  bt_oob_data_t oob_data = {};

  const char* local_name;

  BTM_ReadLocalDeviceName(&local_name);

  if (get_btm_client_interface().local.BTM_ReadLocalDeviceName(&local_name) !=

      BTM_SUCCESS) {

    log::warn("Unable to read local device name");

  }

  for (int i = 0; i < BD_NAME_LEN; i++) {

    oob_data.device_name[i] = local_name[i];

  }

system/stack/btm/btm_client_interface.cc

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "stack/include/acl_api.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_ble_sec_api.h"



struct btm_client_interface_t btm_client_interface = {

    .lifecycle =
@@ -99,6 +98,7 @@ struct btm_client_interface_t btm_client_interface = { 


    .local =

        {

            .BTM_ReadLocalDeviceName = BTM_ReadLocalDeviceName,

            .BTM_ReadLocalDeviceNameFromController =

                BTM_ReadLocalDeviceNameFromController,

            .BTM_SetLocalDeviceName = BTM_SetLocalDeviceName,

system/stack/btm/btm_sec.cc

+5 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include "stack/include/btm_ble_addr.h"

#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_ble_privacy.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/btm_sec_api.h"

#include "stack/include/btm_status.h"
@@ -850,7 +851,10 @@ tBTM_STATUS BTM_SecBondCancel(const RawAddress& bd_addr) { 
        return BTM_CMD_STARTED;

      }

      if (btm_sec_cb.pairing_state == BTM_PAIR_STATE_GET_REM_NAME) {

        BTM_CancelRemoteDeviceName();

        if (get_btm_client_interface().peer.BTM_CancelRemoteDeviceName() !=

            BTM_SUCCESS) {

          log::warn("Unable to cancel RNR");

        }

        btm_sec_cb.pairing_flags |= BTM_PAIR_FLAGS_WE_CANCEL_DD;

        return BTM_CMD_STARTED;

      }

system/stack/gap/gap_ble.cc

+9 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "os/log.h"

#include "stack/include/bt_types.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_client_interface.h"

#include "types/bluetooth/uuid.h"

#include "types/bt_transport.h"

#include "types/raw_address.h"
@@ -139,7 +140,10 @@ tGATT_STATUS read_attr_value(uint16_t handle, tGATT_VALUE* p_value, 


      switch (db_attr.uuid) {

        case GATT_UUID_GAP_DEVICE_NAME:

          BTM_ReadLocalDeviceName((const char**)&p_dev_name);

          if (get_btm_client_interface().local.BTM_ReadLocalDeviceName(

                  (const char**)&p_dev_name) != BTM_SUCCESS) {

            log::warn("Unable to read local device name");

          };

          if (strlen((char*)p_dev_name) > GATT_MAX_ATTR_LEN)

            p_value->len = GATT_MAX_ATTR_LEN;

          else
@@ -487,7 +491,10 @@ void GAP_BleAttrDBUpdate(uint16_t attr_uuid, tGAP_BLE_ATTR_VALUE* p_value) { 
          break;



        case GATT_UUID_GAP_DEVICE_NAME:

          BTM_SetLocalDeviceName((const char*)p_value->p_dev_name);

          if (get_btm_client_interface().local.BTM_SetLocalDeviceName(

                  (const char*)p_value->p_dev_name) != BTM_SUCCESS) {

            log::warn("Unable to set local name");

          }

          break;



        case GATT_UUID_GAP_CENTRAL_ADDR_RESOL: