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

Commit 9dc18cd3 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge changes I0f43061b,I48c18401,I5073e800,I2c0926c7,I73120878 am: e30b7f34 am: e3ea4b1a 

am: 3f048a59

Change-Id: I76d4d2f75ead66e9fe79add732166be9ca6169b6
parents b1920dd5 3f048a59

system/bta/dm/bta_dm_cfg.cc

+0 −6
Original line number Diff line number Diff line
@@ -434,9 +434,6 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = { 
         {{BTA_DM_PM_SNIFF_A2DP_IDX, 10000},

          {BTA_DM_PM_NO_ACTION, 0}},                        /* idle */

         {{BTA_DM_PM_ACTIVE, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* busy */

#if (AMP_INCLUDED == TRUE)

         {{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* amp */

#endif

         {{BTA_DM_PM_RETRY, 5000},

          {BTA_DM_PM_NO_ACTION, 0}} /* mode change retry */

     }}
@@ -456,9 +453,6 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = { 
         {{BTA_DM_PM_NO_PREF, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* sco close */

         {{BTA_DM_PM_NO_PREF, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */

         {{BTA_DM_PM_NO_PREF, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* busy */

#if (AMP_INCLUDED == TRUE)

         {{BTA_DM_PM_NO_PREF, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* amp */

#endif

         {{BTA_DM_PM_RETRY, 5000},

          {BTA_DM_PM_NO_ACTION, 0}} /* mode change retry */

     }}

system/include/bt_target.h

+0 −5
Original line number Diff line number Diff line
@@ -1206,11 +1206,6 @@ 
#define GAP_INCLUDED TRUE

#endif



/* This is set to enable use of GAP L2CAP connections. */

#ifndef GAP_CONN_INCLUDED

#define GAP_CONN_INCLUDED TRUE

#endif



/* The maximum number of simultaneous GAP L2CAP connections. */

#ifndef GAP_MAX_CONNECTIONS

#define GAP_MAX_CONNECTIONS 30

system/include/bt_trace.h

+0 −27
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static const char BTE_LOGMSG_MODULE[] = "bte_logmsg_module"; 
#define BTTRC_ID_STK_CTP 26

#define BTTRC_ID_STK_FTC 27

#define BTTRC_ID_STK_FTS 28

#define BTTRC_ID_STK_GAP 29

#define BTTRC_ID_STK_HCRP 31

#define BTTRC_ID_STK_ICP 32

#define BTTRC_ID_STK_OPC 33
@@ -159,10 +158,6 @@ static const char BTE_LOGMSG_MODULE[] = "bte_logmsg_module"; 
#define SDP_INITIAL_TRACE_LEVEL BT_TRACE_LEVEL_WARNING

#endif



#ifndef GAP_INITIAL_TRACE_LEVEL

#define GAP_INITIAL_TRACE_LEVEL BT_TRACE_LEVEL_WARNING

#endif



#ifndef BNEP_INITIAL_TRACE_LEVEL

#define BNEP_INITIAL_TRACE_LEVEL BT_TRACE_LEVEL_WARNING

#endif
@@ -340,28 +335,6 @@ static const char BTE_LOGMSG_MODULE[] = "bte_logmsg_module"; 
      BT_TRACE(TRACE_LAYER_RFCOMM, TRACE_TYPE_DEBUG, ##__VA_ARGS__); \

  }



/* Generic Access Profile traces */

#define GAP_TRACE_ERROR(...)                                      \

  {                                                               \

    if (gap_cb.trace_level >= BT_TRACE_LEVEL_ERROR)               \

      BT_TRACE(TRACE_LAYER_GAP, TRACE_TYPE_ERROR, ##__VA_ARGS__); \

  }

#define GAP_TRACE_EVENT(...)                                      \

  {                                                               \

    if (gap_cb.trace_level >= BT_TRACE_LEVEL_EVENT)               \

      BT_TRACE(TRACE_LAYER_GAP, TRACE_TYPE_EVENT, ##__VA_ARGS__); \

  }

#define GAP_TRACE_API(...)                                      \

  {                                                             \

    if (gap_cb.trace_level >= BT_TRACE_LEVEL_API)               \

      BT_TRACE(TRACE_LAYER_GAP, TRACE_TYPE_API, ##__VA_ARGS__); \

  }

#define GAP_TRACE_WARNING(...)                                      \

  {                                                                 \

    if (gap_cb.trace_level >= BT_TRACE_LEVEL_WARNING)               \

      BT_TRACE(TRACE_LAYER_GAP, TRACE_TYPE_WARNING, ##__VA_ARGS__); \

  }



/* define traces for HID Host */

#define HIDH_TRACE_ERROR(...)                                     \

  {                                                               \

system/main/bte_logmsg.cc

+0 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "bte.h"

#include "btm_api.h"

#include "btu.h"

#include "gap_api.h"

#include "l2c_api.h"

#include "main_int.h"

#include "osi/include/config.h"
@@ -123,8 +122,6 @@ static tBTTRC_FUNC_MAP bttrc_set_level_map[] = { 
    {BTTRC_ID_STK_HID, BTTRC_ID_STK_HID, HID_HostSetTraceLevel, "TRC_HID_HOST",

     DEFAULT_CONF_TRACE_LEVEL},

#endif

    {BTTRC_ID_STK_GAP, BTTRC_ID_STK_GAP, GAP_SetTraceLevel, "TRC_GAP",

     DEFAULT_CONF_TRACE_LEVEL},

#if (PAN_INCLUDED == TRUE)

    {BTTRC_ID_STK_PAN, BTTRC_ID_STK_PAN, PAN_SetTraceLevel, "TRC_PAN",

     DEFAULT_CONF_TRACE_LEVEL},

system/stack/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ cc_library_static { 
        "btu/btu_hcif.cc",

        "btu/btu_init.cc",

        "btu/btu_task.cc",

        "gap/gap_api.cc",

        "gap/gap_ble.cc",

        "gap/gap_conn.cc",

        "gatt/att_protocol.cc",