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

Commit 57f0b807 authored by Zach Johnson's avatar Zach Johnson
Browse files

Fold bt_scan_mode_t into BTA_DmSetVisibility 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I87154d64544455296ddc5096b4540b6cd16df2d7
parent c0c09eec

system/bta/dm/bta_dm_act.cc

+25 −2
Original line number Diff line number Diff line
@@ -489,8 +489,30 @@ void bta_dm_set_dev_name(const std::vector<uint8_t>& name) { 
}



/** Sets discoverability, connectability and pairability */

void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode_param,

                         tBTA_DM_CONN conn_mode_param) {

bool BTA_DmSetVisibility(bt_scan_mode_t mode) {

  tBTA_DM_DISC disc_mode_param;

  tBTA_DM_CONN conn_mode_param;



  switch (mode) {

    case BT_SCAN_MODE_NONE:

      disc_mode_param = BTA_DM_NON_DISC;

      conn_mode_param = BTA_DM_NON_CONN;

      break;



    case BT_SCAN_MODE_CONNECTABLE:

      disc_mode_param = BTA_DM_NON_DISC;

      conn_mode_param = BTA_DM_CONN;

      break;



    case BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE:

      disc_mode_param = BTA_DM_GENERAL_DISC;

      conn_mode_param = BTA_DM_CONN;

      break;



    default:

      return false;

  }



  uint16_t window, interval;

  uint16_t le_disc_mode = BTM_BleReadDiscoverability();

  uint16_t le_conn_mode = BTM_BleReadConnectability();
@@ -517,6 +539,7 @@ void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode_param, 
    BTM_SetConnectability(conn_mode_param, bta_dm_cb.page_scan_window,

                          bta_dm_cb.page_scan_interval);

  }

  return true;

}



static void bta_dm_process_remove_device_no_callback(

system/bta/include/bta_api.h

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ extern void BTA_DmSetDeviceName(char* p_name); 
 * Returns          void

 *

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

extern void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode, tBTA_DM_CONN conn_mode);

extern bool BTA_DmSetVisibility(bt_scan_mode_t mode);



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

 *

system/btif/src/btif_core.cc

+3 −27
Original line number Diff line number Diff line
@@ -623,35 +623,11 @@ void btif_set_adapter_property(bt_property_t* property) { 


    case BT_PROPERTY_ADAPTER_SCAN_MODE: {

      bt_scan_mode_t mode = *(bt_scan_mode_t*)property->val;

      tBTA_DM_DISC disc_mode;

      tBTA_DM_CONN conn_mode;



      switch (mode) {

        case BT_SCAN_MODE_NONE:

          disc_mode = BTA_DM_NON_DISC;

          conn_mode = BTA_DM_NON_CONN;

          break;



        case BT_SCAN_MODE_CONNECTABLE:

          disc_mode = BTA_DM_NON_DISC;

          conn_mode = BTA_DM_CONN;

          break;



        case BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE:

          disc_mode = BTA_DM_GENERAL_DISC;

          conn_mode = BTA_DM_CONN;

          break;



        default:

          BTIF_TRACE_ERROR("invalid scan mode (0x%x)", mode);

          return;

      }



      BTIF_TRACE_EVENT("set property scan mode : %x", mode);



      BTA_DmSetVisibility(disc_mode, conn_mode);



      if (BTA_DmSetVisibility(mode)) {

        btif_core_storage_adapter_write(property);

      }

    } break;

    case BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT: {

      /* Nothing to do beside store the value in NV.  Java