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

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

Merge "legacy: Globalize to prepare refactor bta/pan/bta_pan_main" am: 6c7dcf8a 

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

Change-Id: Ifc3fd24760437da89afd69e118c4fcbd69f16418
parents 284e9b9b 6c7dcf8a

system/bta/pan/bta_pan_main.cc

+5 −5
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ tBTA_PAN_SCB* bta_pan_scb_alloc(void) { 
 * Returns          void

 *

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

static void bta_pan_sm_execute(tBTA_PAN_SCB* p_scb, uint16_t event,

void bta_pan_sm_execute(tBTA_PAN_SCB* p_scb, uint16_t event,

                        tBTA_PAN_DATA* p_data) {

  tBTA_PAN_ST_TBL state_table;

  uint8_t action;
@@ -193,7 +193,7 @@ static void bta_pan_sm_execute(tBTA_PAN_SCB* p_scb, uint16_t event, 
 * Returns          void

 *

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

static void bta_pan_api_enable(tBTA_PAN_DATA* p_data) {

void bta_pan_api_enable(tBTA_PAN_DATA* p_data) {

  /* initialize control block */

  memset(&bta_pan_cb, 0, sizeof(bta_pan_cb));
@@ -212,7 +212,7 @@ static void bta_pan_api_enable(tBTA_PAN_DATA* p_data) { 
 * Returns          void

 *

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

static void bta_pan_api_disable(UNUSED_ATTR tBTA_PAN_DATA* p_data) {

void bta_pan_api_disable(UNUSED_ATTR tBTA_PAN_DATA* p_data) {

  bta_pan_disable();

}
@@ -226,7 +226,7 @@ static void bta_pan_api_disable(UNUSED_ATTR tBTA_PAN_DATA* p_data) { 
 * Returns          void

 *

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

static void bta_pan_api_open(tBTA_PAN_DATA* p_data) {

void bta_pan_api_open(tBTA_PAN_DATA* p_data) {

  tBTA_PAN_SCB* p_scb;

  tBTA_PAN bta_pan;

system/stack/pan/pan_main.cc

+4 −0
Original line number Diff line number Diff line
@@ -23,14 +23,18 @@ 
 *

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



#include <base/strings/stringprintf.h>

#include <string.h>  // memset



#include <cstdint>



#include "main/shim/dumpsys.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/include/bnep_api.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/sdpdefs.h"

#include "stack/pan/pan_int.h"

#include "types/bluetooth/uuid.h"