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

Commit 291aca96 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Adjust log level for AVCT" am: ef28bb11 

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



Change-Id: Icb1cb7c883f2bf64845c5a9a20ed00b00517214e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b5e19b0 ef28bb11

system/main/bte_logmsg.cc

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ static tBTTRC_FUNC_MAP bttrc_set_level_map[] = { 
     DEFAULT_CONF_TRACE_LEVEL},

    {BTTRC_ID_STK_RFCOMM, BTTRC_ID_STK_RFCOMM_DATA, PORT_SetTraceLevel,

     "TRC_RFCOMM", DEFAULT_CONF_TRACE_LEVEL},

    {BTTRC_ID_STK_AVCT, BTTRC_ID_STK_AVCT, AVCT_SetTraceLevel, "TRC_AVCT",

     DEFAULT_CONF_TRACE_LEVEL},

    {BTTRC_ID_STK_AVDT, BTTRC_ID_STK_AVDT, AVDT_SetTraceLevel, "TRC_AVDT",

     DEFAULT_CONF_TRACE_LEVEL},

    {BTTRC_ID_STK_AVRC, BTTRC_ID_STK_AVRC, AVRC_SetTraceLevel, "TRC_AVRC",

system/stack/avct/avct_api.cc

+30 −5
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


/* Control block for AVCT */

tAVCT_CB avct_cb;

uint8_t avct_trace_level = AVCT_INITIAL_TRACE_LEVEL;



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

 *
@@ -74,11 +75,7 @@ void AVCT_Register() { 
                 &ertm_info, kAvrcBrMtu, AVCT_MIN_BROWSE_MTU,

                 BTA_SEC_AUTHENTICATE);



#if defined(AVCT_INITIAL_TRACE_LEVEL)

  avct_cb.trace_level = AVCT_INITIAL_TRACE_LEVEL;

#else

  avct_cb.trace_level = BT_TRACE_LEVEL_NONE;

#endif

  avct_cb.trace_level = avct_trace_level;

}



/*******************************************************************************
@@ -427,3 +424,31 @@ uint16_t AVCT_MsgReq(uint8_t handle, uint8_t label, uint8_t cr, BT_HDR* p_msg) { 
  }

  return result;

}



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

 *

 * Function         AVCT_SetTraceLevel

 *

 * Description      Sets the trace level for AVCT. If 0xff is passed, the

 *                  current trace level is returned.

 *

 *                  Input Parameters:

 *                      new_level:  The level to set the AVCT tracing to:

 *                      0xff-returns the current setting.

 *                      0-turns off tracing.

 *                      >= 1-Errors.

 *                      >= 2-Warnings.

 *                      >= 3-APIs.

 *                      >= 4-Events.

 *                      >= 5-Debug.

 *

 * Returns          The new trace level or current trace level if

 *                  the input parameter is 0xff.

 *

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

uint8_t AVCT_SetTraceLevel(uint8_t new_level) {

  if (new_level != 0xFF) {

    avct_cb.trace_level = avct_trace_level = new_level;

  }

  return avct_trace_level;

}

system/stack/include/avct_api.h

+23 −0
Original line number Diff line number Diff line
@@ -276,4 +276,27 @@ extern uint16_t AVCT_GetPeerMtu(uint8_t handle); 
extern uint16_t AVCT_MsgReq(uint8_t handle, uint8_t label, uint8_t cr,

                            BT_HDR* p_msg);



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

 *

 * Function         AVCT_SetTraceLevel

 *

 * Description      Sets the trace level for AVCT. If 0xff is passed, the

 *                  current trace level is returned.

 *

 *                  Input Parameters:

 *                      new_level:  The level to set the AVCT tracing to:

 *                      0xff-returns the current setting.

 *                      0-turns off tracing.

 *                      >= 1-Errors.

 *                      >= 2-Warnings.

 *                      >= 3-APIs.

 *                      >= 4-Events.

 *                      >= 5-Debug.

 *

 * Returns          The new trace level or current trace level if

 *                  the input parameter is 0xff.

 *

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

extern uint8_t AVCT_SetTraceLevel(uint8_t new_level);



#endif /* AVCT_API_H */

system/test/mock/mock_stack_avct_api.cc

+4 −0
Original line number Diff line number Diff line
@@ -73,3 +73,7 @@ uint16_t AVCT_RemoveConn(uint8_t handle) { 
}

void AVCT_Deregister(void) { mock_function_count_map[__func__]++; }

void AVCT_Register() { mock_function_count_map[__func__]++; }

uint8_t AVCT_SetTraceLevel(uint8_t new_level) {

  mock_function_count_map[__func__]++;

  return 0;

}

system/test/stub/legacy_trace.cc

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ uint8_t appl_trace_level = 6; 
uint8_t btif_trace_level = 6;



uint8_t A2DP_SetTraceLevel(uint8_t new_level) { return 0; }

uint8_t AVCT_SetTraceLevel(uint8_t new_level) { return 0; }

uint8_t AVDT_SetTraceLevel(uint8_t new_level) { return 0; }

uint8_t AVRC_SetTraceLevel(uint8_t new_level) { return 0; }

uint8_t BNEP_SetTraceLevel(uint8_t new_level) { return 0; }