OSDN Git Service
Ajay Panicker [Wed, 23 Nov 2016 04:28:21 +0000 (20:28 -0800)]
Remove additional usages of UINT_TO_PTR
Bug:
32995283
Test: TestTracker/69659
Change-Id: If37b8bcf30f098f6fc2c4dff82118a9f47a125a3
Ajay Panicker [Thu, 8 Dec 2016 01:52:43 +0000 (17:52 -0800)]
Remove usages of SDP_CLIENT_ENABLED
Test: Sanity test connecting to headset and carkit
Change-Id: I215743c9d07881b9fa8213c52853b9a389f8452d
Treehugger Robot [Thu, 8 Dec 2016 15:07:41 +0000 (15:07 +0000)]
Merge "Remove double includes"
Jakub Pawlowski [Wed, 7 Dec 2016 22:16:35 +0000 (14:16 -0800)]
Build fix
Test: compilation test with BLE_PRIVACY_SPT == FALSE
Change-Id: Icd811584638e37101dabd433d7a4f86807e928fb
Jakub Pawlowski [Wed, 7 Dec 2016 21:34:20 +0000 (13:34 -0800)]
Build fix
Test: compilation test
Change-Id: I44648bcb5e41103066861d7060c0a7dc85cad936
Sanket Agarwal [Wed, 7 Dec 2016 20:29:43 +0000 (20:29 +0000)]
Merge "Implement multiple control blocks for HF Client in BTA/BTIF"
Jakub Pawlowski [Tue, 6 Dec 2016 23:40:58 +0000 (15:40 -0800)]
Simplify btm_ble_resolve_random_addr
Bug:
30622771
Test: manual testing
Change-Id: I604d0e909a6fe270e2b413abbdb497d622780261
Sanket Agarwal [Thu, 1 Dec 2016 03:43:47 +0000 (19:43 -0800)]
Implement multiple control blocks for HF Client in BTA/BTIF
Test: Manual test for multiple incoming/outgoing HF connections
Bug: b/
30984220
Change-Id: If66cad7c9bbc92051ebb7efb2b352c10e7514af3
Sanket Agarwal [Thu, 1 Dec 2016 03:43:47 +0000 (19:43 -0800)]
BTA HF Client should use dynamic control block
Most of the functions in bta_hf_client_at.cc are
currently using a static field for passing callbacks to
BTIF layer. In order to support multi device we need to make
the functions have a parameter which denotes the device.
In order to pass all the required information we choose to
pass the control block for the device instead.
Bug: b/
30984220
Test: Manual regression test
Change-Id: Iac692d7e28df3955ddbd28707c323c41714bd86a
Stephen Hines [Thu, 1 Dec 2016 11:23:35 +0000 (03:23 -0800)]
Properly align some packed data structures.
Bug: http://b/
31532493
Test: Built with -Waddress-of-packed-member enabled.
These data structures later take the address of their uuid field, which
results in a possibly unaligned access to the underlying data. To
prevent the misalignment, we add a further attribute to ensure that the
base of these packed structures is aligned at least as much as the uuid
data member requires (so we can continue using the address of it for
direct dereferences).
Change-Id: I3ec6945b6ea343bef11326a10343309a863786cf
Marie Janssen [Tue, 6 Dec 2016 18:50:32 +0000 (18:50 +0000)]
Replace pthread_mutex with std::mutex
am:
21da63773c
Change-Id: I58a70a7ffbeae8ea19beb828512e863f06fc8fec
Marie Janssen [Thu, 3 Nov 2016 01:31:55 +0000 (18:31 -0700)]
Replace pthread_mutex with std::mutex
In an effort to simplify and reduce errors, replace pthread_mutexes
with std equivalents.
Test: run unit tests & manual sanity checks
Change-Id: I5c33e0b4f4c85133ae4f7415cd19372fc4c7ca1a
liuchao [Tue, 6 Dec 2016 17:01:49 +0000 (17:01 +0000)]
Fix invvalid lcid check in mca_tc_tbl_by_lcid()
am:
7678dcacd8
Change-Id: I6c9de612bb6f7eac37aaf553af0e22a179aeb928
liuchao [Mon, 5 Dec 2016 08:24:04 +0000 (16:24 +0800)]
Fix invvalid lcid check in mca_tc_tbl_by_lcid()
This fixes a potential bug when (lcid - L2CAP_BASE_APPL_CID)
is used as an array index.
Test: mm -j 8
Change-Id: I7f917bf66e4002f65cf1c0bec02eff7d39181790
Myles Watson [Mon, 5 Dec 2016 17:51:25 +0000 (09:51 -0800)]
Remove double includes
Test: mma -j32
Change-Id: I0df664eaadf06af0881c1f55c826ecab52239526
liuchao [Mon, 5 Dec 2016 20:29:35 +0000 (20:29 +0000)]
Remove redundant added bta_hh_find_cb call in read_rpt_clt_cfg
am:
ecff82227b
Change-Id: Ie06a1c231254746f1a30b53a0b51b65c9c311e36
liuchao [Mon, 5 Dec 2016 08:13:39 +0000 (16:13 +0800)]
Remove redundant added bta_hh_find_cb call in read_rpt_clt_cfg
This fixes an redundant call to bta_hh_find_cb to get a bta_hh_index
Test: mm -j 8
Change-Id: I455837d00d992248db8d8432b85227d1f92b3b02
Jaekyun Seok [Mon, 5 Dec 2016 00:43:31 +0000 (00:43 +0000)]
Merge "Use shared lib of libtinyxml2 instead of static one."
am:
344ca410c4
Change-Id: I055cac5d25d03ed8f0b2f3785f5970f794959313
Jaekyun Seok [Mon, 5 Dec 2016 00:38:22 +0000 (00:38 +0000)]
Merge "Use shared lib of libtinyxml2 instead of static one."
Pavlin Radoslavov [Sat, 3 Dec 2016 04:58:18 +0000 (04:58 +0000)]
Add extra logs by default inside sdp_copy_raw_data()
am:
9f9166c583
Change-Id: I13ec9823ecc24cac9f4c353cb233dcc8a1a8ed7a
Myles Watson [Sat, 3 Dec 2016 04:22:51 +0000 (04:22 +0000)]
Fix formatting of config files
am:
dde03b2b53
Change-Id: Ib62f5d6550f395a0f8b3b142a01f1777681d2ecd
Pavlin Radoslavov [Tue, 29 Nov 2016 00:59:43 +0000 (16:59 -0800)]
Add extra logs by default inside sdp_copy_raw_data()
The extra logging is needed for investigating an issue that
is hard to reproduce.
Test: code compilation
Bug:
31795382
Change-Id: Ibe500e332dba8f44485b44bcac32d11be52520a6
Myles Watson [Fri, 2 Dec 2016 20:44:57 +0000 (12:44 -0800)]
Fix formatting of config files
Revert "Apply clang-format to the rest of the tree" for
.conf files
Change-Id: If3f4a06bd8ebceedf1911b77afb29605fbeb92ef
Test: mma -j32
Myles Watson [Fri, 2 Dec 2016 21:15:52 +0000 (21:15 +0000)]
Remove coverity comments
am:
37492db916
Change-Id: I7ce8bb8ace45c456e5830fe26c2bad9bc50a1a24
Myles Watson [Fri, 2 Dec 2016 01:16:23 +0000 (17:16 -0800)]
Remove coverity comments
We aren't actively using coverity, and these may be out
of date.
Test: mma -j32
Change-Id: I3ce75c561dae57019597db85a383a8e434803926
Myles Watson [Fri, 2 Dec 2016 18:11:12 +0000 (18:11 +0000)]
Apply clang-format to the rest of the tree
am:
911d1ae03e
Change-Id: I343d7e7123479d7eb93621b01afed4bad71fd240
Myles Watson [Fri, 2 Dec 2016 18:11:10 +0000 (18:11 +0000)]
Reformat long comments before clang-format
am:
9ca07091a1
Change-Id: Ib93e89aaf7ef4a73c0db1779240958b09a00fa3e
Myles Watson [Tue, 29 Nov 2016 00:44:40 +0000 (16:44 -0800)]
Apply clang-format to the rest of the tree
find * | grep "\.[ch]" | xargs clang-format --style=file -i
Test: mma -j32
Change-Id: I6fcc9862bb7bc07c2a367ca58fef2b3cd27a6f05
Myles Watson [Tue, 29 Nov 2016 00:41:53 +0000 (16:41 -0800)]
Reformat long comments before clang-format
Test: mma -j32
Change-Id: I86a2a4af9dcd22d675ca1f764bb2c9623d63edcc
Jaekyun Seok [Tue, 29 Nov 2016 01:08:10 +0000 (10:08 +0900)]
Use shared lib of libtinyxml2 instead of static one.
libtinyxml2 is used commonly by vendors. So using its shared lib will reduce
total image size even though Android framework size increases as following for
now.
bluetooth.default.so:
1470356 ->
1440664 (-29692)
libtinyxml2.so : 0 -> 46144 (+46144)
total : (+16452)
Test: building succeeded, and the image was tested on angler.
Bug:
33056637
Change-Id: I3bd3cf7128e3ad6daa8157d57935f7422c1f2662
Pavlin Radoslavov [Fri, 2 Dec 2016 07:37:07 +0000 (07:37 +0000)]
Add a mechanism for Audio Feeding Parameters negotiation
am:
4ebaa86a3a
Change-Id: I9ccf11b2a53af91f6ec9ffab10af0de9ce0b0564
Pavlin Radoslavov [Tue, 22 Nov 2016 19:42:11 +0000 (11:42 -0800)]
Add a mechanism for Audio Feeding Parameters negotiation
Previously, the Audio Feeding Parameters between the Media Framework
and A2DP were hard-coded: 44.1 KHz sample rate, 16-bits per sample, Stereo.
Now the Media Framework queries A2DP, and uses the returned values.
Bug: b/
30958229
Test: Manual testing: A2DP streaming to headphones. TestTracker/68727
Change-Id: I70b90d2961ceb9efcd7021d2e12c240fe531ee1c
Jack He [Fri, 2 Dec 2016 02:00:42 +0000 (02:00 +0000)]
Merge "Add dependency installation files for x86_64"
am:
d4e30c774a
Change-Id: I1331151b40af6f7dc164814a74ca3dc7f7edc797
Treehugger Robot [Fri, 2 Dec 2016 01:49:32 +0000 (01:49 +0000)]
Merge "Add dependency installation files for x86_64"
Pavlin Radoslavov [Fri, 2 Dec 2016 01:43:04 +0000 (01:43 +0000)]
A2DP Codec related cleanup
am:
cd02ce9c60
Change-Id: I0d46fa536ecbad215a2031496b5450de9a29f0b0
Pavlin Radoslavov [Sat, 5 Nov 2016 00:18:51 +0000 (17:18 -0700)]
A2DP Codec related cleanup
* Add new A2DP API and the corresponding unit tests:
- A2DP_InitSource2SinkCodec()
- A2DP_SourceCodecSepIndex()
- A2DP_GetTrackBitsPerSample()
* Use the new API to simplify the codec selection and setup
* Rename A2DP_BldSbcMplHdr() to A2DP_BuildMediaPayloadHeaderSbc()
* Remove the following APIs, because they are not needed anymore:
- A2DP_BuildSinkConfig()
- A2DP_CodecConfigMatchesCapabilities()
- A2DP_SetSourceCodec()
- A2DP_CodecRequiresReconfig()
- A2DP_IsSourceCodecSupported()
* Remove the following generic APIs, and keep only the SBC-specific APIs.
The information returned by those functions is SBC-specific, and doesn't
apply to other codecs:
- A2DP_GetNumberOfSubbands()
- A2DP_GetNumberOfBlocks()
- A2DP_GetAllocationMethodCode()
- A2DP_GetChannelModeCode()
- A2DP_GetSamplingFrequencyCode()
- A2DP_GetMinBitpool()
- A2DP_GetMaxBitpool()
* Rename:
A2DP_GetTrackFrequency() -> A2DP_GetTrackSampleRate()
tA2DP_FEEDING_PARAMS.sampling_freq -> sample_rate
tA2DP_FEEDING_PARAMS.num_channel -> channel_count
tA2DP_FEEDING_PARAMS.bit_per_sample -> bits_per_sample
* Remove btif_a2dp_source_encoder_update(), tA2DP_ENCODER_UPDATE_PARAMS
and associated events and processing mechanism, because they are not
needed anymore.
* Remove tA2DP_ENCODER_INTERFACE.encoder_update, because it is not
used anymore.
Now it is superceded by tA2DP_ENCODER_INTERFACE.encoder_init.
* Fix a bug inside bta_av_api_register() when initializing
the stream control block.
* Refactor bta_av_co_audio_getconfig() and bta_av_co_audio_setconfig()
* Remove tBTA_AV_CO_CB.codec_config_setconfig field, because it is not
needed anymore.
* Remove unused arguments when opening/closing audio stream
* Remove #ifdef BTA_AV_DEBUG guards: BTA_AV_DEBUG is always TRUE
* Remove SBC Mono -> Stereo hack
Test: Manual testing: A2DP streaming to headphones. TestTracker/68727
Change-Id: Ie0b209f7ad6c21c2c6d8d2e6277b86dfa63388c6
Jack He [Wed, 30 Nov 2016 01:46:15 +0000 (17:46 -0800)]
Add dependency installation files for x86_64
* The installation script installs the necessary dependencies based on
host OS version on Ubuntu OS
* clang toolchain BUILD.gn will only use clang-3.5 or above
* Update documentation
Test: gn gen out/Default; ninja -C out/Default
Change-Id: Ibc732ebc68009af25e9a911a724a888e008d45ac
Myles Watson [Thu, 1 Dec 2016 22:30:09 +0000 (22:30 +0000)]
Fix asterisks in block quotes
am:
ee96a3c60f
Change-Id: I3bf248c9dd9b28f7f18b55df4357489f4999f549
Myles Watson [Thu, 1 Dec 2016 20:43:32 +0000 (20:43 +0000)]
embdrv: Fix include ordering before clang-format
am:
c7caa5066e
Change-Id: I8af6aa03984d2283b213dbf320e5d0751a94edf6
Myles Watson [Wed, 23 Nov 2016 22:49:54 +0000 (14:49 -0800)]
Fix asterisks in block quotes
Remove double asterisks from block quotes.
git grep -lP '^[*][*]' | xargs sed 's/^[*][*]/ \*/' -i
Fix asterisk line lengths
git grep -l '^[ /][*]\{79,\}[*/]' | \
xargs sed -i s,"^\([ /]\)[*]\([*]\{78\}\)[*]*\([*/]\)","\1\2\3",
Test: mma -j32
Change-Id: Ie3fd375ac2f804cb0f53bf1314a005e85973b3d7
Myles Watson [Tue, 29 Nov 2016 17:40:47 +0000 (09:40 -0800)]
embdrv: Fix include ordering before clang-format
clang-format re-orders #include statements. Fix the includes
so that order is less important.
Test: mma -j32
Change-Id: Ia548c2c7d5669e0e759b3c5e7fa12a1ec48cc03e
Ajay Panicker [Thu, 1 Dec 2016 02:57:15 +0000 (02:57 +0000)]
Remove more usages of UINT_TO_PTR macro
am:
531fe1a8c1
Change-Id: I93895d5e6aa42d0ec75a9c69df9121e542b57e86
Ajay Panicker [Tue, 22 Nov 2016 21:28:43 +0000 (13:28 -0800)]
Remove more usages of UINT_TO_PTR macro
Bug:
32995283
Test: Sanity tests with a carkit and a headset
Change-Id: Ie74ece4814499f771eb1f229558de7df5c726180
Pavlin Radoslavov [Wed, 30 Nov 2016 20:10:43 +0000 (20:10 +0000)]
Merge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event"
am:
845623f07e
Change-Id: I5f34508a6762023f93893886e62430513e21f2b2
Treehugger Robot [Wed, 30 Nov 2016 19:49:44 +0000 (19:49 +0000)]
Merge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event"
Myles Watson [Wed, 30 Nov 2016 18:35:54 +0000 (18:35 +0000)]
Run clang-format on every commit
am:
b42db6400f
Change-Id: I26e77b2d66154d5e9206dae2a9cceb7b6e6bf6e5
Pavlin Radoslavov [Mon, 28 Nov 2016 22:32:40 +0000 (14:32 -0800)]
Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event
Bug:
33114181
Test: Code compilation
Change-Id: Ic2d432b651ea80af2b0ff40fdb61221b0fc31f82
Myles Watson [Tue, 29 Nov 2016 18:58:00 +0000 (10:58 -0800)]
Run clang-format on every commit
Test: repo upload --cbr .
Change-Id: Ib4bea4649320db8890399dda8a285bab69f4b482
Jack He [Wed, 30 Nov 2016 01:38:41 +0000 (01:38 +0000)]
Merge "AVRCP: Fix get metadata attribute responses"
am:
376dfb8071
Change-Id: I2890fc0fd14dfced01702a4dad30020e0222cf18
Treehugger Robot [Wed, 30 Nov 2016 01:31:20 +0000 (01:31 +0000)]
Merge "AVRCP: Fix get metadata attribute responses"
Sanket Agarwal [Wed, 30 Nov 2016 01:28:50 +0000 (01:28 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs"
am:
00a022cbef
Change-Id: If717859f243fa737a6487fe6b595320e08ed31c8
Sanket Agarwal [Wed, 30 Nov 2016 01:23:42 +0000 (01:23 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs"
Jakub Pawlowski [Tue, 29 Nov 2016 23:58:40 +0000 (23:58 +0000)]
Cleanup GATT cache when remote device is disconnected
am:
9580a30918
Change-Id: I41d6b37b9cec3917c79bb89b8f03ff7912a49ece
Sanket Agarwal [Mon, 28 Nov 2016 23:46:29 +0000 (15:46 -0800)]
Add Bluetooth device address parameter to HF Client APIs
Bug:
30984220
Test: SL4A tests for HFP
Change-Id: I62cb69b4296e1b5bdf951ccfafc55433f1ea0a1a
Jakub Pawlowski [Tue, 29 Nov 2016 19:45:09 +0000 (11:45 -0800)]
Cleanup GATT cache when remote device is disconnected
According to Bluetooth spec, GATT cache should not be persisted between
reconnections for unbonded devices. Bonded devices store the cache on
the disk and will read it on reconnection.
Bug:
33123476
Test: sl4a GattReadTest
Change-Id: If2ca53c7b22a346e7236514ea7b461695c923f74
Jack He [Sun, 20 Nov 2016 01:08:28 +0000 (17:08 -0800)]
AVRCP: Fix get metadata attribute responses
* Add checks for remaining buffer capacity to handle long metadata
* Change the attribute number max to AVRC_MAX_NUM_MEDIA_ATTR_ID
* Consolidate attribute value filling code between GetElementAttributes
and GetItemAttributes
* Check requested media attribute IDs before building response
Bug:
32407250,
33001066
Test: manual - connect to carkit and play music, see metadata and hear audio
Change-Id: I8f0c47148be35100202398c754861abb1fb9def1
Marie Janssen [Mon, 28 Nov 2016 21:01:53 +0000 (21:01 +0000)]
readability fix: No assigns in if conditionals
am:
f33b6f434f
Change-Id: I11c5af715b2ad86f33491fae7a5bd530f07a2e96
Marie Janssen [Tue, 22 Nov 2016 23:01:42 +0000 (15:01 -0800)]
readability fix: No assigns in if conditionals
Coccinelle-assisted:
@@
variable i;
expression E;
statement S1, S2;
@@
+ i = E;
if (
(
- (i = E)
+ i
!= ...
|
- (i = E)
+ i
== ...
|
- (i = E)
+ i
< ...
|
- (i = E)
+ i
> ...
|
- (i = E)
+ i
<= ...
|
- (i = E)
+ i
>= ...
|
- (i = E)
+ i
)
) S1 else S2
for file in $(find . -name "*.cc"); do
spatch --sp no-if-assigns.cocci --in-place $file
done
clang-format --style=file -i bta/**/*.cc
Test: mma -j37 and basic sanity testing on angler, sailfish
Change-Id: I41a2964afac347c24e13869b6c172e321e646091
Marie Janssen [Mon, 28 Nov 2016 16:58:06 +0000 (16:58 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"
am:
9f0cc0803c
Change-Id: I3532ac2520edb3f5845ad36549bde71a566aaba0
Marie Janssen [Mon, 28 Nov 2016 16:51:08 +0000 (16:51 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"
Jack He [Thu, 24 Nov 2016 05:58:35 +0000 (05:58 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04"
am:
a4338e32c9
Change-Id: Ibba0d7622b417595b7b0234263c675ff57f47c8d
Treehugger Robot [Thu, 24 Nov 2016 05:54:57 +0000 (05:54 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04"
Myles Watson [Thu, 24 Nov 2016 03:28:59 +0000 (03:28 +0000)]
Merge changes I9ebb32f0,I00393e2b
am:
a9bfdf980f
Change-Id: Ia3988047f5869db610602e821a504d6038359079
Myles Watson [Thu, 24 Nov 2016 03:28:58 +0000 (03:28 +0000)]
Fix formatting after removing defines
am:
9008888d24
Change-Id: I1eb41520b1434fd99d6459384e7ed1e7b0050984
Myles Watson [Thu, 24 Nov 2016 03:28:55 +0000 (03:28 +0000)]
Remove BTA_GATT_INCLUDED
am:
9979121f08
Change-Id: Ie0ad2741c407eabbfbf1a26100a73dc115aa9b93
Treehugger Robot [Thu, 24 Nov 2016 03:24:51 +0000 (03:24 +0000)]
Merge changes I9ebb32f0,I00393e2b
* changes:
Fix formatting after removing defines
Remove BTA_GATT_INCLUDED
Pavlin Radoslavov [Thu, 24 Nov 2016 02:36:51 +0000 (02:36 +0000)]
Fix a unit test failure related to SBC maxbitpool testing
am:
29a0f792cd
Change-Id: I0df5b12f7c4866c9c40adad9a14ab70d637b8e2b
Jack He [Tue, 22 Nov 2016 20:39:52 +0000 (12:39 -0800)]
Fix x86_64 compilation on Ubuntu 14.04
* Add necessary includes in bt_trace.h
* Add toolchain specific configs
* Add libc++ import for clang
* Add libc++abi include for clang
* Add ipc_handler_linux.cc in service/BUILD.gn
* Use shared_mutex when _LIBCPP_VERSION < 3500
* Updated the build instructions
Test: ninja -C out/Default
Change-Id: I362ebf33f62910be817339cc6bdc62830f57db30
liuchao [Wed, 23 Nov 2016 08:21:01 +0000 (16:21 +0800)]
Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd
This fixes a potential NULL-pointer access in case p_remote_cmd is NULL
Test: mm -j 8
Change-Id: I06ae9afb9ae161296828e06b2c00d921189bee5c
Pavlin Radoslavov [Thu, 24 Nov 2016 00:36:14 +0000 (16:36 -0800)]
Fix a unit test failure related to SBC maxbitpool testing
The unit test failure was introduced / overlooked by an earlier CL.
Test: running "test/run_unit_tests.sh net_test_stack"
Change-Id: I40824a903a0dbef3bdab965ef5c390a8939cc5ee
Myles Watson [Wed, 23 Nov 2016 18:21:37 +0000 (18:21 +0000)]
Remove SMP_INCLUDED define
am:
2e8e9f4213
Change-Id: I367644b2861f510a54c04159314b25a8f37dfd17
Myles Watson [Wed, 23 Nov 2016 18:21:36 +0000 (18:21 +0000)]
Remove BLE_INCLUDED define
am:
84baa7f16e
Change-Id: I5fd29a1f8c9f7d88e04c689fbd3514cfcb546af4
Myles Watson [Wed, 16 Nov 2016 00:33:22 +0000 (16:33 -0800)]
Fix formatting after removing defines
clang-format -i --style=file bta/*/* btif/*/* include/*
Test: mma -j32
Change-Id: I9ebb32f0cc5bd24a7cb2ae25699999aab5036b13
Myles Watson [Fri, 18 Nov 2016 16:42:23 +0000 (08:42 -0800)]
Remove BTA_GATT_INCLUDED
Test: Connect to a BLE Keyboard
Change-Id: I00393e2bf09fb65533e953896563e69aab5a22dc
Myles Watson [Tue, 15 Nov 2016 00:45:15 +0000 (16:45 -0800)]
Remove SMP_INCLUDED define
Test: Connect to a BLE Keyboard
Change-Id: I785692cb61f4ca5ccccab7424aa03f50c54523c9
Myles Watson [Mon, 14 Nov 2016 20:05:37 +0000 (12:05 -0800)]
Remove BLE_INCLUDED define
Test: Connect to a BLE Keyboard
Change-Id: I5f8f4017c90c3c404004632fd10e6c2b93bd7783
Sanket Agarwal [Wed, 23 Nov 2016 02:16:48 +0000 (02:16 +0000)]
Merge "Audio pops due to queue not flushed when focus taken off"
am:
4ef712926d
Change-Id: I8d330883afc4c593ab615250be435ca71c95b199
Sanket Agarwal [Wed, 23 Nov 2016 02:11:36 +0000 (02:11 +0000)]
Merge "Audio pops due to queue not flushed when focus taken off"
Jakub Pawlowski [Wed, 23 Nov 2016 01:58:07 +0000 (01:58 +0000)]
Merge "Report proper advertiser status on registration error"
am:
1f28e7bdf1
Change-Id: I3e87e5c14339f54abe763051e7e62bdb1e26507c
Treehugger Robot [Wed, 23 Nov 2016 01:51:51 +0000 (01:51 +0000)]
Merge "Report proper advertiser status on registration error"
Marie Janssen [Wed, 23 Nov 2016 01:30:45 +0000 (01:30 +0000)]
btif: DRY up command functions
am:
1ee1d33e3a
Change-Id: I6d900fa8bc9bf99772c22311d99f01bf3a03ae63
Marie Janssen [Wed, 16 Nov 2016 17:58:22 +0000 (09:58 -0800)]
btif: DRY up command functions
also:
clang-format -i --style=file btif/src/btif_rc.cc
Test: sl4a AvrcpController tests
Change-Id: I95f7e6922c096e2460ecdeafad162515f5600d97
Sanket Agarwal [Tue, 22 Nov 2016 23:00:25 +0000 (15:00 -0800)]
Audio pops due to queue not flushed when focus taken off
Test: (Manual) The stutter after music is resumed is gone
Bug: b/
32296397
Change-Id: Id188c56a196c2ece13510488e6bcfb717bcc610c
Jakub Pawlowski [Tue, 22 Nov 2016 20:51:20 +0000 (12:51 -0800)]
Report proper advertiser status on registration error
When advertiser is not started because too many advertisers are
registered, return proper error code.
Bug:
30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: Ie8a94b964170edbbf1c56f39b03ad98f745a4861
Ajay Panicker [Tue, 22 Nov 2016 20:12:26 +0000 (20:12 +0000)]
Remove some usages of UINT_TO_PTR macro
am:
58d57a46cb
Change-Id: Ib7b119d61954ea75fbf0e9a195c7d2b9ca2b2d8a
Ajay Panicker [Mon, 21 Nov 2016 21:16:48 +0000 (13:16 -0800)]
Remove some usages of UINT_TO_PTR macro
Bug:
32995283
Test: Sanity test with various devices
Change-Id: I20a0b1571c044170ba5a8792d8e990a6790cbce2
Marie Janssen [Tue, 22 Nov 2016 17:50:14 +0000 (17:50 +0000)]
Constant Cleanup: Remove BT_TRACE_VERBOSE
am:
a1e7e55610
Change-Id: I9fd413cc608ea9e7f838314685324c0c9e8d5a52
Marie Janssen [Tue, 22 Nov 2016 15:50:15 +0000 (07:50 -0800)]
Constant Cleanup: Remove BT_TRACE_VERBOSE
BT_TRACE_VERBOSE turned on constants-as-strings in
logs in many parts of the stack, which is preferable
to obscure numbers.
Test: m -j37, check logspam is not worse than normal on a device
Change-Id: I1d24f1c1337290a8a2bcd9a0d937c9e0f1f1c611
Jakub Pawlowski [Fri, 18 Nov 2016 22:35:58 +0000 (22:35 +0000)]
Move startAdvertising() logic into native code (2/3)
am:
a75087effc
Change-Id: Id4350dc5b6ba474106026eb1d781c341ceee8c78
Jakub Pawlowski [Thu, 17 Nov 2016 21:27:28 +0000 (13:27 -0800)]
Move startAdvertising() logic into native code (2/3)
AdvertiseManager.startAdvertising() was implemented in Java layer for
historical reasons. Now that we have nice native callbacks and tests,
it can be moved into native code, where it will be shared between
Android daemon and bluetoothtbd.
Bug:
30622771
Test: native tests added to cover startAdvertising
Change-Id: Idf5d3c53b6ad21d8c7e239b5b150b88e073bb709
Andre Eisenbach [Fri, 18 Nov 2016 19:33:07 +0000 (19:33 +0000)]
Merge "Do not reject valid SBC codec parameters"
am:
54ee0d8916
Change-Id: I41e3215f9f385d60bc7a183011fccc4f51a6cca3
Andre Eisenbach [Fri, 18 Nov 2016 19:27:44 +0000 (19:27 +0000)]
Merge "Do not reject valid SBC codec parameters"
Andre Eisenbach [Fri, 18 Nov 2016 18:03:46 +0000 (10:03 -0800)]
Do not reject valid SBC codec parameters
Fixes logic in A2DP_CodecInfoMatchesCapabilitySbc that could otherwise
reject valid SBC codec parameters, leading to A2DP being disconnected.
Example:
Tesla Model S - min bitpool = 2; max bitpool = 60
Android - min bitpool = 2; max bitpool = 53
Bug:
32688022
Test: Added test to test_a2dp_is_source_codec_supported to cover this bug
Change-Id: If02bab1c47f926f82a636184cf3cbd1edbbe223a
Jakub Pawlowski [Thu, 17 Nov 2016 19:50:22 +0000 (19:50 +0000)]
Add BUILD.gn for tinyxml
am:
cc51b4f8c2
Change-Id: Ic27a1bb7c558fcc91bffb75e726c36547f1b5dda
Jakub Pawlowski [Thu, 17 Nov 2016 19:37:17 +0000 (11:37 -0800)]
Add BUILD.gn for tinyxml
Change-Id: I82d2bb25470d46516e0ab6114bf85cb93f9023ac
Andre Eisenbach [Thu, 17 Nov 2016 07:14:02 +0000 (07:14 +0000)]
Revert "Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect."
am:
475f8e0e65
Change-Id: I9169f8f868fd91a340a189f677fdc5afe0f4c539
Andre Eisenbach [Thu, 17 Nov 2016 05:08:20 +0000 (21:08 -0800)]
Revert "Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect."
This reverts commit
5bd9ffbe6fbf22b7072bc1a63e3152a916276ddf.
Despite the original patch intention, it actually causes various remote
devices (tested Android Auto, Logitech Speakerphone, Tesla Model S and
many more) to no connect A2DP (only HFP) in various re-connect
scenarios.
This is due to the fact that the stream end point type is not correctly
determined yet in some of these scenarios causing the AVDT stream to be
closed prematurely and thus the A2DP connection to fail.
Test: manual; various devices
Fixes:
32688022
Ajay Panicker [Thu, 17 Nov 2016 02:50:30 +0000 (02:50 +0000)]
Limit the use of AVRC_ADV_CTRL_INCLUDED define
am:
365fbfb547
Change-Id: I13c2a5acf6f85b1866892e98875b7ab7e44528b1
Ajay Panicker [Wed, 16 Nov 2016 21:47:27 +0000 (13:47 -0800)]
Limit the use of AVRC_ADV_CTRL_INCLUDED define
Use AVRC_ADV_CTRL_INCLUDED just to control features instead of
controlling features and inclusion of functions.
Change-Id: Ifff0d7006c3d8df1d57c79ace19ee60487c2f0a5
Ajay Panicker [Wed, 16 Nov 2016 22:07:27 +0000 (22:07 +0000)]
Remove pointer to integer cast in btif_sock_l2cap to prevent crash on 64 bit systems
am:
135db4f344
Change-Id: Iab92a03c25fc9e20b7e1f36a267d1d2f501e53e7