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

Commit 603d5ba5 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Re-include stack/pan am: ad3b9c36 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1811522

Change-Id: Ib71faf155617d3332aeecf0d71d74de1f3f62664
parents 25ab9a11 ad3b9c36

system/stack/pan/pan_api.cc

+9 −12
Original line number Original line Diff line number Diff line
@@ -23,19 +23,16 @@ 
 *

 *

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

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





#include "pan_api.h"

#include <base/logging.h>

#include <base/logging.h>

#include <string.h>

#include <cstdint>

#include "bnep_api.h"



#include "bt_common.h"

#include "bta/sys/bta_sys.h"

#include "bta_sys.h"

#include "osi/include/allocator.h"

#include "btm_api.h"

#include "stack/include/bnep_api.h"

#include "hcidefs.h"

#include "stack/include/pan_api.h"

#include "l2c_api.h"

#include "stack/include/sdp_api.h"

#include "pan_int.h"

#include "stack/include/sdpdefs.h"

#include "sdp_api.h"

#include "stack/pan/pan_int.h"

#include "sdpdefs.h"

#include "stack/btm/btm_sec.h"





using bluetooth::Uuid;

using bluetooth::Uuid;

system/stack/pan/pan_int.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,11 @@ 
#ifndef PAN_INT_H

#ifndef PAN_INT_H

#define PAN_INT_H

#define PAN_INT_H





#include "pan_api.h"

#include <cstdint>



#include "stack/include/pan_api.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"





/*

/*

 * This role is used to shutdown the profile. Used internally

 * This role is used to shutdown the profile. Used internally

system/stack/pan/pan_main.cc

+9 −11
Original line number Original line Diff line number Diff line
@@ -23,17 +23,15 @@ 
 *

 *

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

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





#include <string.h>

#include <string.h>  // memset

#include "bnep_api.h"



#include "bt_common.h"

#include <cstdint>

#include "bt_utils.h"



#include "hcidefs.h"

#include "osi/include/allocator.h"

#include "l2c_api.h"

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

#include "osi/include/osi.h"

#include "stack/include/bnep_api.h"

#include "pan_api.h"

#include "stack/include/sdpdefs.h"

#include "pan_int.h"

#include "stack/pan/pan_int.h"

#include "sdp_api.h"

#include "sdpdefs.h"





using bluetooth::Uuid;

using bluetooth::Uuid;

system/stack/pan/pan_utils.cc

+5 −12
Original line number Original line Diff line number Diff line
@@ -24,18 +24,11 @@ 
 *****************************************************************************/

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





#include <base/logging.h>

#include <base/logging.h>

#include <stdio.h>

#include <cstdint>

#include <string.h>



#include "bnep_api.h"

#include "stack/include/sdp_api.h"

#include "bt_common.h"

#include "stack/pan/pan_int.h"

#include "btm_api.h"

#include "types/raw_address.h"

#include "hcidefs.h"

#include "l2c_api.h"

#include "pan_api.h"

#include "pan_int.h"

#include "sdp_api.h"

#include "sdpdefs.h"

#include "stack/btm/btm_sec.h"





static const uint8_t pan_proto_elem_data[] = {

static const uint8_t pan_proto_elem_data[] = {

    0x35, 0x18,       /* data element sequence of length 0x18 bytes */

    0x35, 0x18,       /* data element sequence of length 0x18 bytes */