OSDN Git Service

android-x86/system-bt.git
7 years agoAdd extra logs by default inside sdp_copy_raw_data()
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

7 years agoFix formatting of config files
Myles Watson [Sat, 3 Dec 2016 04:22:51 +0000 (04:22 +0000)]
Fix formatting of config files
am: dde03b2b53

Change-Id: Ib62f5d6550f395a0f8b3b142a01f1777681d2ecd

7 years agoAdd extra logs by default inside sdp_copy_raw_data()
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

7 years agoFix formatting of config files
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

7 years agoRemove coverity comments
Myles Watson [Fri, 2 Dec 2016 21:15:52 +0000 (21:15 +0000)]
Remove coverity comments
am: 37492db916

Change-Id: I7ce8bb8ace45c456e5830fe26c2bad9bc50a1a24

7 years agoRemove coverity comments
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

7 years agoApply clang-format to the rest of the tree
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

7 years agoReformat long comments before clang-format
Myles Watson [Fri, 2 Dec 2016 18:11:10 +0000 (18:11 +0000)]
Reformat long comments before clang-format
am: 9ca07091a1

Change-Id: Ib93e89aaf7ef4a73c0db1779240958b09a00fa3e

7 years agoApply clang-format to the rest of the tree
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

7 years agoReformat long comments before clang-format
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

7 years agoAdd a mechanism for Audio Feeding Parameters negotiation
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

7 years agoAdd a mechanism for Audio Feeding Parameters negotiation
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

7 years agoMerge "Add dependency installation files for x86_64"
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

7 years agoMerge "Add dependency installation files for x86_64"
Treehugger Robot [Fri, 2 Dec 2016 01:49:32 +0000 (01:49 +0000)]
Merge "Add dependency installation files for x86_64"

7 years agoA2DP Codec related cleanup
Pavlin Radoslavov [Fri, 2 Dec 2016 01:43:04 +0000 (01:43 +0000)]
A2DP Codec related cleanup
am: cd02ce9c60

Change-Id: I0d46fa536ecbad215a2031496b5450de9a29f0b0

7 years agoA2DP Codec related cleanup
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

7 years agoAdd dependency installation files for x86_64
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

7 years agoFix asterisks in block quotes
Myles Watson [Thu, 1 Dec 2016 22:30:09 +0000 (22:30 +0000)]
Fix asterisks in block quotes
am: ee96a3c60f

Change-Id: I3bf248c9dd9b28f7f18b55df4357489f4999f549

7 years agoembdrv: Fix include ordering before clang-format
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

7 years agoFix asterisks in block quotes
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

7 years agoembdrv: Fix include ordering before clang-format
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

7 years agoRemove more usages of UINT_TO_PTR macro
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

7 years agoRemove more usages of UINT_TO_PTR macro
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

7 years agoMerge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event"
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

7 years agoMerge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event"
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"

7 years agoRun clang-format on every commit
Myles Watson [Wed, 30 Nov 2016 18:35:54 +0000 (18:35 +0000)]
Run clang-format on every commit
am: b42db6400f

Change-Id: I26e77b2d66154d5e9206dae2a9cceb7b6e6bf6e5

7 years agoAdd a missing error check when processing AVDT_RECONFIG_CFM_EVT event
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

7 years agoRun clang-format on every commit
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

7 years agoMerge "AVRCP: Fix get metadata attribute responses"
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

7 years agoMerge "AVRCP: Fix get metadata attribute responses"
Treehugger Robot [Wed, 30 Nov 2016 01:31:20 +0000 (01:31 +0000)]
Merge "AVRCP: Fix get metadata attribute responses"

7 years agoMerge "Add Bluetooth device address parameter to HF Client APIs"
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

7 years agoMerge "Add Bluetooth device address parameter to HF Client APIs"
Sanket Agarwal [Wed, 30 Nov 2016 01:23:42 +0000 (01:23 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs"

7 years agoCleanup GATT cache when remote device is disconnected
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

7 years agoAdd Bluetooth device address parameter to HF Client APIs
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

7 years agoCleanup GATT cache when remote device is disconnected
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

7 years agoAVRCP: Fix get metadata attribute responses
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: 3240725033001066
Test: manual - connect to carkit and play music, see metadata and hear audio
Change-Id: I8f0c47148be35100202398c754861abb1fb9def1

7 years agoreadability fix: No assigns in if conditionals
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

7 years agoreadability fix: No assigns in if conditionals
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

7 years agoMerge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"
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

7 years agoMerge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"
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"

7 years agoMerge "Fix x86_64 compilation on Ubuntu 14.04"
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

7 years agoMerge "Fix x86_64 compilation on Ubuntu 14.04"
Treehugger Robot [Thu, 24 Nov 2016 05:54:57 +0000 (05:54 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04"

7 years agoMerge changes I9ebb32f0,I00393e2b
Myles Watson [Thu, 24 Nov 2016 03:28:59 +0000 (03:28 +0000)]
Merge changes I9ebb32f0,I00393e2b
am: a9bfdf980f

Change-Id: Ia3988047f5869db610602e821a504d6038359079

7 years agoFix formatting after removing defines
Myles Watson [Thu, 24 Nov 2016 03:28:58 +0000 (03:28 +0000)]
Fix formatting after removing defines
am: 9008888d24

Change-Id: I1eb41520b1434fd99d6459384e7ed1e7b0050984

7 years agoRemove BTA_GATT_INCLUDED
Myles Watson [Thu, 24 Nov 2016 03:28:55 +0000 (03:28 +0000)]
Remove BTA_GATT_INCLUDED
am: 9979121f08

Change-Id: Ie0ad2741c407eabbfbf1a26100a73dc115aa9b93

7 years agoMerge changes I9ebb32f0,I00393e2b
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

7 years agoFix a unit test failure related to SBC maxbitpool testing
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

7 years agoFix x86_64 compilation on Ubuntu 14.04
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

7 years agoFix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd
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

7 years agoFix a unit test failure related to SBC maxbitpool testing
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

7 years agoRemove SMP_INCLUDED define
Myles Watson [Wed, 23 Nov 2016 18:21:37 +0000 (18:21 +0000)]
Remove SMP_INCLUDED define
am: 2e8e9f4213

Change-Id: I367644b2861f510a54c04159314b25a8f37dfd17

7 years agoRemove BLE_INCLUDED define
Myles Watson [Wed, 23 Nov 2016 18:21:36 +0000 (18:21 +0000)]
Remove BLE_INCLUDED define
am: 84baa7f16e

Change-Id: I5fd29a1f8c9f7d88e04c689fbd3514cfcb546af4

7 years agoFix formatting after removing defines
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

7 years agoRemove BTA_GATT_INCLUDED
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

7 years agoRemove SMP_INCLUDED define
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

7 years agoRemove BLE_INCLUDED define
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

7 years agoMerge "Audio pops due to queue not flushed when focus taken off"
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

7 years agoMerge "Audio pops due to queue not flushed when focus taken off"
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"

7 years agoMerge "Report proper advertiser status on registration error"
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

7 years agoMerge "Report proper advertiser status on registration error"
Treehugger Robot [Wed, 23 Nov 2016 01:51:51 +0000 (01:51 +0000)]
Merge "Report proper advertiser status on registration error"

7 years agobtif: DRY up command functions
Marie Janssen [Wed, 23 Nov 2016 01:30:45 +0000 (01:30 +0000)]
btif: DRY up command functions
am: 1ee1d33e3a

Change-Id: I6d900fa8bc9bf99772c22311d99f01bf3a03ae63

7 years agobtif: DRY up command functions
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

7 years agoAudio pops due to queue not flushed when focus taken off
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

7 years agoReport proper advertiser status on registration error
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

7 years agoRemove some usages of UINT_TO_PTR macro
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

7 years agoRemove some usages of UINT_TO_PTR macro
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

7 years agoConstant Cleanup: Remove BT_TRACE_VERBOSE
Marie Janssen [Tue, 22 Nov 2016 17:50:14 +0000 (17:50 +0000)]
Constant Cleanup: Remove BT_TRACE_VERBOSE
am: a1e7e55610

Change-Id: I9fd413cc608ea9e7f838314685324c0c9e8d5a52

7 years agoConstant Cleanup: Remove BT_TRACE_VERBOSE
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

7 years agoMove startAdvertising() logic into native code (2/3)
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

7 years agoMove startAdvertising() logic into native code (2/3)
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

7 years agoMerge "Do not reject valid SBC codec parameters"
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

7 years agoMerge "Do not reject valid SBC codec parameters"
Andre Eisenbach [Fri, 18 Nov 2016 19:27:44 +0000 (19:27 +0000)]
Merge "Do not reject valid SBC codec parameters"

7 years agoDo 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

7 years agoAdd BUILD.gn for tinyxml
Jakub Pawlowski [Thu, 17 Nov 2016 19:50:22 +0000 (19:50 +0000)]
Add BUILD.gn for tinyxml
am: cc51b4f8c2

Change-Id: Ic27a1bb7c558fcc91bffb75e726c36547f1b5dda

7 years agoAdd BUILD.gn for tinyxml
Jakub Pawlowski [Thu, 17 Nov 2016 19:37:17 +0000 (11:37 -0800)]
Add BUILD.gn for tinyxml

Change-Id: I82d2bb25470d46516e0ab6114bf85cb93f9023ac

7 years agoRevert "Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect."
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

7 years agoRevert "Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect."
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

7 years agoLimit the use of AVRC_ADV_CTRL_INCLUDED define
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

7 years agoLimit the use of AVRC_ADV_CTRL_INCLUDED define
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

7 years agoRemove pointer to integer cast in btif_sock_l2cap to prevent crash on 64 bit systems
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

7 years agoRemove pointer to integer cast in btif_sock_l2cap to prevent crash on 64 bit systems
Ajay Panicker [Fri, 11 Nov 2016 04:02:24 +0000 (20:02 -0800)]
Remove pointer to integer cast in btif_sock_l2cap to prevent crash on 64 bit systems

Bug: 24400656
Test: Previously crashed Bluetooth, does not crash after patch
Change-Id: Ia381abca72e46d369a0de1749e42d1b6273a321a

7 years agobtif: Remove AVRC_CTRL_INCLUDED ifdefs
Marie Janssen [Wed, 16 Nov 2016 03:25:20 +0000 (03:25 +0000)]
btif: Remove AVRC_CTRL_INCLUDED ifdefs
am: 133f0b6503

Change-Id: I69ac329cdb25382c535941900cb94d2f8ca17f13

7 years agobtif: Remove AVRC_CTRL_INCLUDED ifdefs
Marie Janssen [Tue, 15 Nov 2016 22:54:16 +0000 (14:54 -0800)]
btif: Remove AVRC_CTRL_INCLUDED ifdefs

AVRCP controller side support is always included now.

Test: croot system/bt && mma -j37

Change-Id: I22260b4f123b352f70cbab54a19b5f8f5f171825

7 years agobtif: Remove unused uinput interface code
Marie Janssen [Tue, 15 Nov 2016 22:49:33 +0000 (22:49 +0000)]
btif: Remove unused uinput interface code
am: 919fac80da

Change-Id: Ic775fc53ed88138ccfcd1630b48b615fb23f9025

7 years agobtif: Remove unused uinput interface code
Marie Janssen [Tue, 15 Nov 2016 16:24:24 +0000 (08:24 -0800)]
btif: Remove unused uinput interface code

uinput isn't used anymore; all media commands go through the HAL

Test: croot system/bt && mma -j37

Change-Id: I83ab133794683a26e250ea10927fa95b2e2cb28a

7 years agoMerge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU"
liuchao [Tue, 15 Nov 2016 21:27:08 +0000 (21:27 +0000)]
Merge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU"
am: f62708b918

Change-Id: I07fb489e12c92fb3371fdeaaaa0225951985d48e

7 years agoMerge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU"
Treehugger Robot [Tue, 15 Nov 2016 21:21:15 +0000 (21:21 +0000)]
Merge "Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU"

7 years agoNULL-pointer access before check in BTM_SetBleDataLength
liuchao [Tue, 15 Nov 2016 21:19:27 +0000 (21:19 +0000)]
NULL-pointer access before check in BTM_SetBleDataLength
am: 7d1faf334e

Change-Id: I3b00debc158e417177b139c72ed1e6d2410b901a

7 years agoFix a NULL-pointer check order reverse in GATTC_ConfigureMTU
liuchao [Mon, 14 Nov 2016 08:13:10 +0000 (16:13 +0800)]
Fix a NULL-pointer check order reverse in GATTC_ConfigureMTU

This fixes a potential NULL-pointer check order reverse
in case failed to get TCB using the TCB index

Test: mm -j 8
Change-Id: I8fcc168d7d077f8df7c7abb9c325c5168fa8cd39

7 years agoNULL-pointer access before check in BTM_SetBleDataLength
liuchao [Mon, 14 Nov 2016 03:13:12 +0000 (11:13 +0800)]
NULL-pointer access before check in BTM_SetBleDataLength

This fixes a potential NULL-pointer access in case
the ACL DB for the requested BDA is not found.

Test: mm -j 8

Change-Id: I86ab66730aa0d9a143ddde851bd33a05a405bb7f

7 years agoMerge "Copying of pointer with incorrect size"
Sanket Agarwal [Tue, 15 Nov 2016 02:27:24 +0000 (02:27 +0000)]
Merge "Copying of pointer with incorrect size"
am: ab10655bfb

Change-Id: I24b5690545a902368daefedad204673b15479985

7 years agoMerge "Copying of pointer with incorrect size"
Treehugger Robot [Tue, 15 Nov 2016 02:18:44 +0000 (02:18 +0000)]
Merge "Copying of pointer with incorrect size"

7 years agoRemove unused GATT_Listen
Jakub Pawlowski [Tue, 15 Nov 2016 01:58:38 +0000 (01:58 +0000)]
Remove unused GATT_Listen
am: a60c5fdaa2

Change-Id: I8c334dae6ffedfd65a01bee400b145346c9ad861

7 years agoCopying of pointer with incorrect size
Sanket Agarwal [Tue, 8 Nov 2016 22:23:22 +0000 (14:23 -0800)]
Copying of pointer with incorrect size

We are passing the value in pointer (UINT_TO_PTR) hence no copy is
required for the context transfer (simply use the UINT value in the
event field instead)

Change-Id: I43625c3a4d68cd8cbadd51b1fccc4138583082b6

7 years agoRemove unused GATT_Listen
Jakub Pawlowski [Mon, 14 Nov 2016 23:57:42 +0000 (15:57 -0800)]
Remove unused GATT_Listen

Bug: 30622771
Test: still builds
Change-Id: I4003a1241e611c9c1f2a21090ea3ba7530b0643a

7 years agoReenable advertising instance after an LE advertising state change
Jakub Pawlowski [Mon, 14 Nov 2016 21:20:37 +0000 (21:20 +0000)]
Reenable advertising instance after an LE advertising state change
am: 06325e3d5d

Change-Id: I68e342b054c4547262a20fa12d938875554cc7ed

7 years agoReenable advertising instance after an LE advertising state change
Jakub Pawlowski [Mon, 14 Nov 2016 19:20:52 +0000 (11:20 -0800)]
Reenable advertising instance after an LE advertising state change

Ensure BleAdvertisingManager::OnAdvertisingStateChanged() is called
after an advertising state change to re-enable advertising after
a connection.

This patch also fixes the registration test, which was broken since
one more advertising instance was freed for general usage.

Test: net_test_stack_multi_adv native test
Change-Id: I76887d98cb3ec386ebc0f7fad95170b8c18b9116

7 years agoRemove useless NULL-pointer check code in l2cap_client_new
liuchao [Sun, 13 Nov 2016 09:42:42 +0000 (09:42 +0000)]
Remove useless NULL-pointer check code in l2cap_client_new
am: 8c29b62b08

Change-Id: Ib11a39dac9a58df3ddf01526f568cfb22832842f

7 years agoRemove useless NULL-pointer check code in l2cap_client_new
liuchao [Fri, 11 Nov 2016 07:51:39 +0000 (15:51 +0800)]
Remove useless NULL-pointer check code in l2cap_client_new

Remove the useless "error:" label and NULL-pointer check block

Test: mm -j 8

Change-Id: I218f5f1e2741a49a0fe9bec749dea2484a1df2eb

7 years agoAVRCP: unify Get{Element,Item}Attributes response.
Marie Janssen [Sat, 12 Nov 2016 04:52:46 +0000 (04:52 +0000)]
AVRCP: unify Get{Element,Item}Attributes response.
am: 033d5a211b

Change-Id: I1b23eb87a9f56bf0834b94c3d5a8016501b13726