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

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

Merge "legacy: Remove #PAN_SUPPORTS_ROLE_PANU" am: 3305bc02 am: 6a6f050a am: 61a63142 

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

Change-Id: Ic11807b5cc4196bced39ddd70bc4efebefaa9730
parents b13b7d9f 61a63142

system/btif/src/stack_manager.cc

+9 −0
Original line number Diff line number Diff line
@@ -108,6 +108,15 @@ static_assert( 
    "  Pan profile always supports network access point in the bluetooth stack"

    "*** Conditional Compilation Directive error");



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

// this check and error statement may be removed.

static_assert(

    PAN_SUPPORTS_ROLE_PANU,

    "#define PAN_SUPPORTS_ROLE_PANU preprocessor compilation flag is "

    "unsupported"

    "  Pan profile always supports user as a client 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
@@ -170,7 +170,6 @@ tPAN_RESULT PAN_SetRole(uint8_t role, const char* p_user_name, 
    }

  }



#if (PAN_SUPPORTS_ROLE_PANU == TRUE)

  if (role & PAN_ROLE_CLIENT) {

    /* Check the service name */

    if ((p_user_name == NULL) || (*p_user_name == 0))
@@ -194,7 +193,6 @@ tPAN_RESULT PAN_SetRole(uint8_t role, const char* p_user_name, 
      bta_sys_remove_uuid(UUID_SERVCLASS_PANU);

    }

  }

#endif



  pan_cb.role = role;

  PAN_TRACE_EVENT("PAN role set to: %d", role);