diff options
| author | Wink Saville <wink@google.com> | 2012-08-20 20:37:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-20 20:37:26 -0700 |
| commit | 6204666c25b8c92d76e700796bcc9924cc514a21 (patch) | |
| tree | 7edd1c2685f92825ddca43f8ad95c397bb22510a /bta | |
| parent | cfe4e211a58a33944c588b2ed8f785ebeaa46084 (diff) | |
| parent | 127248594c6b24235aa233237d5cd27cb584d6d8 (diff) | |
| download | external_bluetooth_bluedroid-6204666c25b8c92d76e700796bcc9924cc514a21.zip external_bluetooth_bluedroid-6204666c25b8c92d76e700796bcc9924cc514a21.tar.gz external_bluetooth_bluedroid-6204666c25b8c92d76e700796bcc9924cc514a21.tar.bz2 | |
Merge "Add support for per device bluetooth configuration." into jb-mr1-dev
Diffstat (limited to 'bta')
| -rw-r--r-- | bta/Android.mk | 4 | ||||
| -rw-r--r-- | bta/dm/bta_dm_cfg.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bta/Android.mk b/bta/Android.mk index 22665a3..7d1c19e 100644 --- a/bta/Android.mk +++ b/bta/Android.mk @@ -8,7 +8,7 @@ ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true) LOCAL_CFLAGS += \ -DBOARD_HAVE_BLUETOOTH_BCM endif -LOCAL_CFLAGS += -DBUILDCFG +LOCAL_CFLAGS += -DBUILDCFG $(bdroid_CFLAGS) LOCAL_PRELINK_MODULE:=false LOCAL_SRC_FILES:= \ @@ -96,8 +96,8 @@ LOCAL_C_INCLUDES+= . \ $(LOCAL_PATH)/../hcis/patchram \ $(LOCAL_PATH)/../udrv/include \ $(LOCAL_PATH)/../brcm/include \ + $(bdroid_C_INCLUDES) \ -include $(LOCAL_PATH)/../include/buildcfg.mk include $(BUILD_STATIC_LIBRARY) diff --git a/bta/dm/bta_dm_cfg.c b/bta/dm/bta_dm_cfg.c index d3ae0ec..f0f7ac9 100644 --- a/bta/dm/bta_dm_cfg.c +++ b/bta/dm/bta_dm_cfg.c @@ -324,7 +324,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTM_PM_PWR_MD bta_dm_pm_md[] = { /* more sniff parameter entries can be added for BTA_DM_PM_SNIFF3 - BTA_DM_PM_SNIFF7, if needed When entries are added or removed, BTA_DM_PM_PARK_IDX needs to be updated to reflect the actual index -BTA_DM_PM_PARK_IDX is defined in bta_api.h and can be override by the buildcfg.h settings. +BTA_DM_PM_PARK_IDX is defined in bta_api.h and can be override by the bdroid_buildcfg.h settings. The SNIFF table entries must be in the order from highest latency (biggest interval) to lowest latency. If there's a conflict among the connected services, the setting with lowest latency wins. */ |