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

Commit ff458e30 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "stack::inq Finalize extract inquiry API"" into main am: d5600515 am: f95a8353 

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



Change-Id: If396ca8adb8caad117aa3923cccf1d82b4b4fe9d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbf27378 f95a8353

system/bta/dm/bta_dm_act.cc

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include "stack/include/bt_types.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_inq.h"

#include "stack/include/gatt_api.h"

#include "stack/include/l2c_api.h"

#include "stack/include/main_thread.h"

system/stack/btm/btm_inq.cc

+1 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include "common/time_util.h"

#include "hci/controller_interface.h"

#include "hci/event_checkers.h"

#include "hci/hci_layer.h"

#include "hci/hci_interface.h"

#include "internal_include/bt_target.h"

#include "main/shim/acl_api.h"

#include "main/shim/entry.h"
@@ -62,7 +62,6 @@ 
#include "stack/include/bt_lap.h"

#include "stack/include/bt_types.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/hci_error_code.h"

system/stack/include/btm_api.h

+0 −117
Original line number Diff line number Diff line
@@ -168,123 +168,6 @@ void BTM_WriteVoiceSettings(uint16_t settings); 
 ******************************************************************************/

[[nodiscard]] tBTM_STATUS BTM_EnableTestMode(void);



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

 * DEVICE DISCOVERY FUNCTIONS - Inquiry, Remote Name, Discovery, Class of Device

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



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

 *

 * Function         BTM_SetDiscoverability

 *

 * Description      This function is called to set the device into or out of

 *                  discoverable mode. Discoverable mode means inquiry

 *                  scans are enabled.  If a value of '0' is entered for window

 *                  or interval, the default values are used.

 *

 * Returns          BTM_SUCCESS if successful

 *                  BTM_BUSY if a setting of the filter is already in progress

 *                  BTM_NO_RESOURCES if couldn't get a memory pool buffer

 *                  BTM_ILLEGAL_VALUE if a bad parameter was detected

 *                  BTM_WRONG_MODE if the device is not up.

 *

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

[[nodiscard]] tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode);



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

 *

 * Function         BTM_StartInquiry

 *

 * Description      This function is called to start an inquiry.

 *

 * Parameters:      p_inqparms - pointer to the inquiry information

 *                      mode - GENERAL or LIMITED inquiry

 *                      duration - length in 1.28 sec intervals (If '0', the

 *                                 inquiry is CANCELLED)

 *                      filter_cond_type - BTM_CLR_INQUIRY_FILTER,

 *                                         BTM_FILTER_COND_DEVICE_CLASS, or

 *                                         BTM_FILTER_COND_BD_ADDR

 *                      filter_cond - value for the filter (based on

 *                                                          filter_cond_type)

 *

 *                  p_results_cb  - Pointer to the callback routine which gets

 *                                called upon receipt of an inquiry result. If

 *                                this field is NULL, the application is not

 *                                notified.

 *

 *                  p_cmpl_cb   - Pointer to the callback routine which gets

 *                                called upon completion.  If this field is

 *                                NULL, the application is not notified when

 *                                completed.

 * Returns          tBTM_STATUS

 *                  BTM_CMD_STARTED if successfully initiated

 *                  BTM_BUSY if already in progress

 *                  BTM_ILLEGAL_VALUE if parameter(s) are out of range

 *                  BTM_NO_RESOURCES if could not allocate resources to start

 *                                   the command

 *                  BTM_WRONG_MODE if the device is not up.

 *

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

[[nodiscard]] tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb,

                                           tBTM_CMPL_CB* p_cmpl_cb);



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

 *

 * Function         BTM_IsInquiryActive

 *

 * Description      Return a bit mask of the current inquiry state

 *

 * Returns          Bitmask of current inquiry state

 *

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

[[nodiscard]] uint16_t BTM_IsInquiryActive(void);



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

 *

 * Function         BTM_CancelInquiry

 *

 * Description      This function cancels an inquiry if active

 *

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

void BTM_CancelInquiry(void);



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

 *

 * Function         BTM_SetConnectability

 *

 * Description      This function is called to set the device into or out of

 *                  connectable mode. Discoverable mode means page scans are

 *                  enabled.

 *

 * Returns          BTM_SUCCESS if successful

 *                  BTM_ILLEGAL_VALUE if a bad parameter is detected

 *                  BTM_NO_RESOURCES if could not allocate a message buffer

 *                  BTM_WRONG_MODE if the device is not up.

 *

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

[[nodiscard]] tBTM_STATUS BTM_SetConnectability(uint16_t page_mode);



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

 *

 * Function         BTM_SetInquiryMode

 *

 * Description      This function is called to set standard, with RSSI

 *                  mode or extended of the inquiry for local device.

 *

 * Input Params:    BTM_INQ_RESULT_STANDARD, BTM_INQ_RESULT_WITH_RSSI or

 *                  BTM_INQ_RESULT_EXTENDED

 *

 * Returns          BTM_SUCCESS if successful

 *                  BTM_NO_RESOURCES if couldn't get a memory pool buffer

 *                  BTM_ILLEGAL_VALUE if a bad parameter was detected

 *                  BTM_WRONG_MODE if the device is not up.

 *

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

[[nodiscard]] tBTM_STATUS BTM_SetInquiryMode(uint8_t mode);



void BTM_EnableInterlacedInquiryScan();



void BTM_EnableInterlacedPageScan();



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

 *

 * Function         BTM_ReadRemoteDeviceName

system/stack/include/btm_inq.h

+30 −6
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode);

[[nodiscard]] tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode);



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

 *
@@ -74,7 +74,7 @@ tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode); 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb,

[[nodiscard]] tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb,

                                           tBTM_CMPL_CB* p_cmpl_cb);



/*******************************************************************************
@@ -86,7 +86,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
 * Returns          Bitmask of current inquiry state

 *

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

uint16_t BTM_IsInquiryActive(void);

[[nodiscard]] uint16_t BTM_IsInquiryActive(void);



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

 *
@@ -111,7 +111,7 @@ void BTM_CancelInquiry(void); 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_SetConnectability(uint16_t page_mode);

[[nodiscard]] tBTM_STATUS BTM_SetConnectability(uint16_t page_mode);



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

 *
@@ -129,8 +129,32 @@ tBTM_STATUS BTM_SetConnectability(uint16_t page_mode); 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_SetInquiryMode(uint8_t mode);

[[nodiscard]] tBTM_STATUS BTM_SetInquiryMode(uint8_t mode);



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

 *

 * Function         BTM_EnableInterlacedInquiryScan

 *

 * Description      Reads system property PROPERTY_INQ_SCAN_TYPE and

 *                  enables interlaced inquiry scan with controller support.

 *

 * Input Params:    None

 *

 * Returns          void

 *

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

void BTM_EnableInterlacedInquiryScan();



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

 *

 * Function         BTM_EnableInterlacedPageScan

 *

 * Description      Reads system property PROPERTY_PAGE_SCAN_TYPE and

 *                  enables interlaced page scan with controller support.

 *

 * Input Params:    None

 *

 * Returns          void

 *

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

void BTM_EnableInterlacedPageScan();

system/stack/test/btm/stack_btm_inq_test.cc

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <bluetooth/log.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <stdlib.h>



#include <future>
@@ -27,7 +26,7 @@ 
#include "hci/hci_layer_fake.h"

#include "hci/hci_packets.h"

#include "stack/btm/btm_int_types.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_inq.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/inq_hci_link_interface.h"

#include "stack/include/main_thread.h"