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

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

Merge "legacy: Remove #PAN_SUPPORTS_ROLE_NAP" am: 7c2cb4a6 am: 01998a25 am: 4b53b57f 

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

Change-Id: I18a83604333d0526d693073a6561b412a8984e8e
parents a9cffb25 4b53b57f

system/btif/src/stack_manager.cc

+8 −0
Original line number Diff line number Diff line
@@ -100,6 +100,14 @@ static_assert( 
    "  Pan profile is always included in the bluetooth stack"

    "*** Conditional Compilation Directive error");



// Once PAN_SUPPORTS_ROLE_NAP is no longer exposed via bt_target.h

// this check and error statement may be removed.

static_assert(

    PAN_SUPPORTS_ROLE_NAP,

    "#define PAN_SUPPORTS_ROLE_NAP preprocessor compilation flag is unsupported"

    "  Pan profile always supports network access point in the bluetooth stack"

    "*** Conditional Compilation Directive error");



void main_thread_shut_down();

void main_thread_start_up();

void BTA_dm_on_hw_on();

system/stack/pan/pan_api.cc

+0 −2
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ tPAN_RESULT PAN_SetRole(uint8_t role, const char* p_user_name, 


  /* Register all the roles with SDP */

  PAN_TRACE_API("PAN_SetRole() called with role 0x%x", role);

#if (PAN_SUPPORTS_ROLE_NAP == TRUE)

  if (role & PAN_ROLE_NAP_SERVER) {

    /* Check the service name */

    if ((p_nap_name == NULL) || (*p_nap_name == 0))
@@ -170,7 +169,6 @@ tPAN_RESULT PAN_SetRole(uint8_t role, const char* p_user_name, 
      bta_sys_remove_uuid(UUID_SERVCLASS_NAP);

    }

  }

#endif



#if (PAN_SUPPORTS_ROLE_PANU == TRUE)

  if (role & PAN_ROLE_CLIENT) {

system/stack/pan/pan_utils.cc

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ uint32_t pan_register_with_sdp(uint16_t uuid, const char* p_name, 
  SDP_AddAttribute(sdp_handle, ATTR_ID_SECURITY_DESCRIPTION, UINT_DESC_TYPE, 2,

                   (uint8_t*)&security);



#if (PAN_SUPPORTS_ROLE_NAP == TRUE)

  if (uuid == UUID_SERVCLASS_NAP) {

    uint16_t NetAccessType = 0x0005;      /* Ethernet */

    uint32_t NetAccessRate = 0x0001312D0; /* 10Mb/sec */
@@ -122,7 +121,6 @@ uint32_t pan_register_with_sdp(uint16_t uuid, const char* p_name, 
    SDP_AddAttribute(sdp_handle, ATTR_ID_MAX_NET_ACCESS_RATE, UINT_DESC_TYPE, 4,

                     array);

  }

#endif



  /* Make the service browsable */

  SDP_AddUuidSequence(sdp_handle, ATTR_ID_BROWSE_GROUP_LIST, 1, &browse_list);