OSDN Git Service
Jakub Pawlowski [Fri, 7 Apr 2017 12:50:16 +0000 (05:50 -0700)]
ESR11-E7716: Disable scans while setting local RPA
This change is required to disable any ongoing classic
advertisement or any scan before setting the RPA for the
DUT, and reenable them after the Set RPA command.
If a direct connection is ongoing, the RPA is not set.
A background connection is suspended and resumed for
sending the "Set RPA" HCI command.
This patch is based on CAF patch by niarora@codeaurora.org
690c2db21f650f74c202fd380cca4ca74cbdf83c
Test: manual
Bug:
35935853
Change-Id: Ifbc90d0c52c8f1fa627ac80c20a69149e89cb794
(cherry picked from commit
6bd467a004f4416aafc7fbd4da19b1e54578fd18)
Jakub Pawlowski [Mon, 20 Mar 2017 22:38:56 +0000 (15:38 -0700)]
Support for H7 function for key derivation
This change sets bit 5 of the auth req to 1 to display
the support for H7 function, for key derivation.
Also, it adds the implementation of the h7 function as
defined in the spec (ERRATA E7301]
H7 is used if both host and remote devices exhibit
their support for H7 function in the auth request,
else the key derivation falls back to the H6
implementation.
The method is similar for derivation from either
transports with the only difference being in the first
byte of the SAL used in h7.
This patch is based on CAF patch by niarora@codeaurora.org
70668ad34ff15d0a53aea612d3c488fa575176ca
Test: manual
Bug:
35935853
Change-Id: I2fa29b2f3d2b3ac007b2f5f024871f81220237d8
(cherry picked from commit
e7f14a682d57811d9df0d64372f222bcc143ec86)
Pavlin Radoslavov [Thu, 6 Apr 2017 22:13:16 +0000 (15:13 -0700)]
Add A2DP codec-specific information to dumpsys output
Now we print the following information:
* Current codec name
* Info for each supported codec:
- Priority
- Encoder interval (ms)
- Codec Config: Sampling rate, Bits per sample, Channel mode (MONO/STEREO)
- Selectable codec configuration
- Codec's local capability
- Packet counts (expected/dropped)
- PCM read counts (expected/actual)
- PCM read bytes (expected/actual)
* LDAC codec-specific info:
- LDAC quality mode: HIGH/MID/LOW/ABR
- LDAC saved transmit queue length [used in ABR mode]
* SBC codec-specific info:
- Frames counts (expected/dropped)
Sample of the new format is below:
---
A2DP Codecs State:
Current Codec: LDAC
A2DP LDAC State:
Priority:
1000000
Encoder interval (ms): 20
Config: Rate=96000 Bits=32 Mode=STEREO
Selectable: Rate=44100|48000|88200|96000 Bits=16|24|32 Mode=MONO|STEREO
Local capability: Rate=44100|48000|88200|96000 Bits=16|24|32 Mode=MONO|STEREO
Packet counts (expected/dropped) : 596 / 161
PCM read counts (expected/actual) : 2488 / 2488
PCM read bytes (expected/actual) :
2547712 /
2547712
LDAC quality mode : ABR
LDAC saved transmit queue length : 0
A2DP aptX-HD State:
Priority: 4001
Encoder interval (ms): 0
Config: Invalid
Selectable: Invalid
Local capability: Rate=44100|48000 Bits=24 Mode=STEREO
Packet counts (expected/dropped) : 0 / 0
PCM read counts (expected/actual) : 0 / 0
PCM read bytes (expected/actual) : 0 / 0
A2DP aptX State:
Priority: 3001
Encoder interval (ms): 0
Config: Rate=44100 Bits=16 Mode=STEREO
Selectable: Rate=44100|48000 Bits=16 Mode=STEREO
Local capability: Rate=44100|48000 Bits=16 Mode=STEREO
Packet counts (expected/dropped) : 0 / 0
PCM read counts (expected/actual) : 0 / 0
PCM read bytes (expected/actual) : 0 / 0
A2DP AAC State:
Priority: 2001
Encoder interval (ms): 20
Config: Rate=44100 Bits=16 Mode=STEREO
Selectable: Rate=44100|48000 Bits=16 Mode=STEREO
Local capability: Rate=44100|48000|88200|96000 Bits=16 Mode=STEREO
Packet counts (expected/dropped) : 0 / 0
PCM read counts (expected/actual) : 0 / 0
PCM read bytes (expected/actual) : 0 / 0
A2DP SBC State:
Priority: 1001
Encoder interval (ms): 20
Config: Rate=44100 Bits=16 Mode=STEREO
Selectable: Rate=44100 Bits=16 Mode=STEREO
Local capability: Rate=44100 Bits=16 Mode=STEREO
Packet counts (expected/dropped) : 580 / 0
PCM read counts (expected/actual) : 2900 / 2900
PCM read bytes (expected/actual) :
1484800 /
1484800
Frames counts (expected/dropped) : 3724 / 0
---
Bug:
36567128
Test: Stream A2DP and "adb shell dumpsys bluetooth_manager"
Change-Id: Idd86005b842a4e569b7df91b8bbaf0632ed7f7c9
(cherry picked from commit
302113d4e44f06e90f90a5903e33ae830edb58a3)
Pavlin Radoslavov [Wed, 5 Apr 2017 23:18:26 +0000 (16:18 -0700)]
Create unit test framework for audio_a2dp_hw
Create unit test framework for audio_a2dp_hw and implement a unit test
for function audio_a2dp_hw_stream_compute_buffer_size()
Also:
* Remove obsolete check for mixer unit size inside out_get_buffer_size()
* Reorganize the file structure inside directory audio_a2dp_hw/ :
- Moved the source code files *.cc to audio_a2dp_hw/src/
- Moved the header file(s) *.h to audio_a2dp_hw/include/
- The unit test file(s) are stored in audio_a2dp_hw/test/
Bug:
35849921
Test: This is the unit test. Code compilation and unit test succeed
Change-Id: I3dcc508cb6799462b7103cb2ee452b4399843899
(cherry picked from commit
304ceeb5202060a9c625a55369cbf28d72f5e2d9)
Jacky Cheung [Fri, 7 Apr 2017 23:57:19 +0000 (23:57 +0000)]
DO NOT MERGE ANYWHERE Mark AutoConnParamUpdateAddr on first auto connection param update am:
dd467f108f -s ours
am:
1386ae5d92 -s ours
Change-Id: Ieea4194c4ea69e72f92a21dbd08eff94d390a02d
Jacky Cheung [Fri, 7 Apr 2017 23:53:48 +0000 (23:53 +0000)]
DO NOT MERGE ANYWHERE Mark AutoConnParamUpdateAddr on first auto connection param update
am:
dd467f108f -s ours
Change-Id: Iae88352c83d7f3b1430c02e2af3a683bebae3bb2
Jakub Pawlowski [Thu, 6 Apr 2017 13:59:20 +0000 (06:59 -0700)]
Fix "LE Read Maximum Advertising Data Length" response parsing
The value is uint16_t, not uint8_t
Bug:
30622771
Test: manual
Change-Id: I93e8687fa74cb0f5877f9921a860b2ba83106691
(cherry picked from commit
16899e9d1ef49aedba8435ff3a5e4476f036427a)
Myles Watson [Tue, 7 Mar 2017 13:00:04 +0000 (05:00 -0800)]
Finish conversion to Android.bp
Bug:
35651902,
35672576,
36810308
Test: build, Android Cloud Bluetooth net_test_bluetooth
Change-Id: Ie99966d610ea35ab8caf8a084d92c43618e90b94
TreeHugger Robot [Wed, 5 Apr 2017 17:51:07 +0000 (17:51 +0000)]
Merge "test: Add a simulated Bluetooth HAL implementation" into oc-dev
Myles Watson [Tue, 7 Mar 2017 12:28:51 +0000 (04:28 -0800)]
test: Add a simulated Bluetooth HAL implementation
Bug:
35672576
Test: Angler Bluetooth starts/stops with test HAL
Android Cloud net_test_bluetooth tests pass
Change-Id: I104e0dd3946f0efff9709e05c056bee3538394f7
Pavlin Radoslavov [Tue, 4 Apr 2017 18:31:29 +0000 (11:31 -0700)]
Compute the audio data buffer size based on stream characteristics
Use the audio data stream characteristics (sample rate, bits per sample,
channel mode) to compute the audio stream output buffer size from
the Audio A2DP HAL to the Bluetooth stack.
Previously, the buffer size was pre-computed based on the original
(44.1kHz, 16 bits per sample, Stereo) PCM audio stream used by SBC.
NOTE: We cannot change the buffer size on the receiver side (Bluetooth),
because SO_RCVBUF option does not have effect for Domain Sockets.
Also, removed uipc_linux.h header file, because it is not used.
Test: A2DP streaming and switching the codecs, sample rate, bits per sample
Bug:
35849921
Change-Id: Ib6772f7564442ac18a02876a5aa5e3208e5aade1
(cherry picked from commit
b32704f424e0ab4cd33ad670173997f8e3a0a31c)
Jorge E. Moreira [Mon, 27 Mar 2017 22:44:55 +0000 (15:44 -0700)]
test-vendor-lib: Enable building for 64 bits
Removes LOCAL_MODULE_PATH which is not supported for 64 bit builds.
Uses LOCAL_PROPRIETARY_MODULE to let the build system know it should
go in the vendor directory.
Test: builds
Change-Id: Iba55d497d8cbe97911a41a5623248306a8954ec2
(cherry picked from commit
77c6bc5886da34011fc6b6bfcc15cf19dc4b5b68)
Andy Hung [Thu, 30 Mar 2017 23:28:46 +0000 (16:28 -0700)]
audio_a2dp_hw: add device lock
Prevent conflict between closing a stream (adev_close_output_stream)
and setting parameters (adev_set_parameters).
Test: Manual - Bluetooth A2DP streaming and changing codec parameters
Bug:
36723276
Change-Id: Id8b9fcdf594e3d5fde139719d324420468c4c0aa
Jakub Pawlowski [Fri, 31 Mar 2017 03:41:02 +0000 (20:41 -0700)]
Bluetooth 5 advertising duration refactoring (1/4)
Expose both duration and maximum extended advertising events to limit
advertising time.
Test: manual
Bug:
30622771
Change-Id: I4475c322347899946b39e65026d8009e02c93759
(cherry picked from commit
5204c62f137de9b6c2834391fd329457d3fdbc84)
Jakub Pawlowski [Thu, 30 Mar 2017 18:52:53 +0000 (11:52 -0700)]
Include flags in all connectable packets
According to Bluetooth CSSv7, the flags field shall be included in all
connectable packets, not only legacy packets.
Test: manal
Bug:
30622771
Change-Id: I006f9bd6d31ca0673d78405f320b18623e6e5b16
(cherry picked from commit
9389b64629776238e6ee69b1f37bdec97187e75e)
Jakub Pawlowski [Wed, 29 Mar 2017 21:28:43 +0000 (14:28 -0700)]
Bluetooth 5 periodic scan (2/3)
This patch wires calls/callbacks through stack to prepare for actual
implementation.
Test: manual
Bug:
30622771
Change-Id: Iac8c74a228f34f5ea4231a76848e22ea64f11d06
(cherry picked from commit
f685bfb7b1f6da17165a33590b18f559476e670f)
Ajay Panicker [Thu, 30 Mar 2017 17:33:19 +0000 (10:33 -0700)]
Delete bt_snoop.log when snoop logging is disabled
This patch will immediatly delete the snoop log if Bluetooth is on. If Bluetooth
is off it will delete the log as soon as Bluetooth starts again.
Test: Turn off logging while Bluetooth is on and off
Bug:
36718948
Change-Id: Ib660cd442c93f1a34c948d51c5cffc38695558d5
TreeHugger Robot [Thu, 30 Mar 2017 02:40:54 +0000 (02:40 +0000)]
Merge "l2cap: Use CHECK for memory allocation errors" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 01:39:52 +0000 (01:39 +0000)]
Merge "osi: Update error messages" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 01:36:05 +0000 (01:36 +0000)]
Merge "hci: Update error messages" into oc-dev
Myles Watson [Tue, 21 Mar 2017 17:28:20 +0000 (10:28 -0700)]
osi: Update error messages
Test: build
Change-Id: I5af34f01c47d8037d56c27e7e3fab3cc2f5fd2bc
(cherry picked from commit
1dc4b361ddc16ec8d917b052c8a3d9bdb28bbd1c)
Myles Watson [Tue, 21 Mar 2017 17:16:44 +0000 (10:16 -0700)]
l2cap: Use CHECK for memory allocation errors
Test: LE connection
Change-Id: I43c170b40b125345b91e1c91a7993f0d138ac1c5
(cherry picked from commit
1d418ba650480d99cdf10ee814b6224de4ee88ce)
Myles Watson [Tue, 21 Mar 2017 17:21:15 +0000 (10:21 -0700)]
hci: Update error messages
Test: builds
Change-Id: I33544572122a166523a40dde090f276b102df247
(cherry picked from commit
ec728d3136aabcd7675aba4a672d932e0709c509)
Pavlin Radoslavov [Fri, 24 Feb 2017 18:35:30 +0000 (10:35 -0800)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug:
35873828
Change-Id: Ia1311d790441b7b5471c9fda7aeee8aa3306b16e
(cherry picked from commit
2073c3eb61f69864e645c50005f11c4e8b5e2588)
Pavlin Radoslavov [Wed, 29 Mar 2017 01:40:32 +0000 (18:40 -0700)]
Add missing dependency on the Sony LDAC ABR library libldacBT_abr.so
Test: Code compilation
Bug:
35381097
Change-Id: Ib347319942aef4fef6bfd7edc23a4df004fc19fa
(cherry picked from commit
e4f2b615678ccb1fe7e13da4f166c9a45fd16136)
fen wang [Tue, 28 Mar 2017 05:20:02 +0000 (05:20 +0000)]
Integration of LDAC Adaptive Bit Rate mechanism am:
dfc02a91a1 am:
2bbd84b0e3
am:
66d7309640
Change-Id: I53f5b3af71ff05c24c40e428665dde981712df7a
fen wang [Tue, 28 Mar 2017 05:11:49 +0000 (05:11 +0000)]
Integration of LDAC Adaptive Bit Rate mechanism am:
dfc02a91a1
am:
2bbd84b0e3
Change-Id: Iae3bb76449af74af89a37be6ef4445fc828996f7
fen wang [Tue, 28 Mar 2017 05:03:51 +0000 (05:03 +0000)]
Integration of LDAC Adaptive Bit Rate mechanism
am:
dfc02a91a1
Change-Id: I5a82550e3f70768063f811c64b7d68e4a85e7ce6
fen wang [Wed, 15 Mar 2017 05:52:52 +0000 (14:52 +0900)]
Integration of LDAC Adaptive Bit Rate mechanism
LDAC ABR controls LDAC encoder bit rate based on A2DP transmit queue
length.
It can be used if the LDAC ABR library is installed on the device:
libldacBT_abr.so
Test: manual
Bug:
35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
Jakub Pawlowski [Mon, 27 Mar 2017 20:54:21 +0000 (20:54 +0000)]
Add option to specify initial LE connection PHY (1/3) am:
96fb273d92 am:
f0b97cad96
am:
4ee5145383
Change-Id: I49a3c0d17f3987cbff52ddbdbbfd7fab4a8ecaea
Jakub Pawlowski [Mon, 27 Mar 2017 20:51:21 +0000 (20:51 +0000)]
Add option to specify initial LE connection PHY (1/3) am:
96fb273d92
am:
f0b97cad96
Change-Id: I16eee0c1c46b93e9e0773e906782f17a9c432900
Jakub Pawlowski [Mon, 27 Mar 2017 20:48:19 +0000 (20:48 +0000)]
Add option to specify initial LE connection PHY (1/3)
am:
96fb273d92
Change-Id: I083e1ef7f4fe6d958fb2f3d4d3faaffd02c2d3be
Jakub Pawlowski [Sat, 25 Mar 2017 00:52:02 +0000 (17:52 -0700)]
Add option to specify initial LE connection PHY (1/3)
For whitelist connections we always use all possible PHYs, for direct
connection use PHY specified by client.
Test: manual
Bug:
30622771
Change-Id: I720f134e2800dc3d282135bb7ffbe3882117c680
Zach Johnson [Fri, 24 Mar 2017 21:26:33 +0000 (21:26 +0000)]
Merge "btm_sec: p_name fails matching security records" am:
e9082e66c2 am:
73071a04b1
am:
f98c8de067
Change-Id: Icebcbde0d537c9bc5d37a9d0577ce12114d32b75
Zach Johnson [Fri, 24 Mar 2017 21:24:03 +0000 (21:24 +0000)]
Merge "btm_sec: p_name fails matching security records" am:
e9082e66c2
am:
73071a04b1
Change-Id: Ic2036538f8eb950c01de850411d4017732d80c0d
Zach Johnson [Fri, 24 Mar 2017 21:22:08 +0000 (21:22 +0000)]
Merge "btm_sec: p_name fails matching security records"
am:
e9082e66c2
Change-Id: Ia2c574d1a36f840045110d55a6d34fb89776890e
Zach Johnson [Fri, 24 Mar 2017 21:19:30 +0000 (21:19 +0000)]
Merge "btm_sec: p_name fails matching security records"
Jakub Pawlowski [Fri, 24 Mar 2017 20:47:14 +0000 (20:47 +0000)]
Expose connection update callback (1/3) am:
b5ba4fdbc4 am:
8e6bf08046
am:
f45314ce13
Change-Id: Iee7714ddedf1a594209657192406ec468be60410
Jakub Pawlowski [Fri, 24 Mar 2017 20:42:05 +0000 (20:42 +0000)]
Expose connection update callback (1/3) am:
b5ba4fdbc4
am:
8e6bf08046
Change-Id: I283b1416e2ad4122137ac585762f4ffa6bfbb9bc
Jakub Pawlowski [Fri, 24 Mar 2017 20:36:43 +0000 (20:36 +0000)]
Expose connection update callback (1/3)
am:
b5ba4fdbc4
Change-Id: I609d1fb2788c93ced5cf4a6afa302fed59543a6d
Martin Brabham [Thu, 16 Feb 2017 23:06:30 +0000 (15:06 -0800)]
btm_sec: p_name fails matching security records
When doing a comparison on p_name that is passed in against
the p_name in the struct will never match if the passed in
name is >= 21 characters. This is due to the strlcpy replacing
the last character with a null termination character.
Without this patch, you will observe 2 security records for
"Android Network Acce" (which is supposed to be "Android Network Access Point")
BTM_SEC_SERVCE_NAME_LEN = 21
21
passed in: |A|n|d|r|o|i|d| |N|e|t|w|o|r|k| |A|c|c|e|s|s| |P|o|i|n|t|
---------------------------------------------------------
structval: |A|n|d|r|o|i|d| |N|e|t|w|o|r|k| |A|c|c|e|\0|
Bug:
34707848
Test: Compile, Manual
Change-Id: I24e0204d8faf54545c7b720a0fbc6765db9a1295
Jakub Pawlowski [Fri, 24 Mar 2017 01:11:04 +0000 (18:11 -0700)]
Expose connection update callback (1/3)
Test: manual
Bug:
30622771
Change-Id: I94d25f6f22b42fb1432a9288c97b82503d57db86
Myles Watson [Fri, 24 Mar 2017 15:57:14 +0000 (15:57 +0000)]
hci: Timestamp HCI commands for timeouts am:
17d3595cf1 am:
8bc0c70cc1
am:
92dd65aa67
Change-Id: I8794647aef2153008ced8c9e021598f2494facea
Myles Watson [Fri, 24 Mar 2017 15:54:40 +0000 (15:54 +0000)]
hci: Timestamp HCI commands for timeouts am:
17d3595cf1
am:
8bc0c70cc1
Change-Id: Ic6aac41fb0320e35bb9e88dfd4782a7ffa4f0655
Myles Watson [Fri, 24 Mar 2017 15:52:39 +0000 (15:52 +0000)]
hci: Timestamp HCI commands for timeouts
am:
17d3595cf1
Change-Id: Ic22314e4b18e8b405f96f38e93849ae2c3dbade8
Myles Watson [Thu, 23 Mar 2017 21:34:40 +0000 (14:34 -0700)]
hci: Timestamp HCI commands for timeouts
Test: Start Bluetooth with COMMAND_PENDING_TIMOUT_MS=2
Change-Id: I393592ede7b9b0aab9c13f6c79756c24edd3d930
Jakub Pawlowski [Fri, 24 Mar 2017 01:17:00 +0000 (01:17 +0000)]
Set preferred PHY and read PHY implementation (3/3) am:
eafd45d086 am:
ba23876865
am:
abe47b88c5
Change-Id: I1f94325ea389cba9a1fa56e6cbdb407d98f9a1a4
Jakub Pawlowski [Fri, 24 Mar 2017 01:15:01 +0000 (01:15 +0000)]
Set preferred PHY and read PHY implementation (3/3) am:
eafd45d086
am:
ba23876865
Change-Id: Ie4bdf53b73df8e4aae8a348d1d23776fc3c546fa
Jakub Pawlowski [Fri, 24 Mar 2017 01:12:59 +0000 (01:12 +0000)]
Set preferred PHY and read PHY implementation (3/3)
am:
eafd45d086
Change-Id: I59ac8486bd565062ebc5c5a9908100c834a0344c
Jakub Pawlowski [Thu, 23 Mar 2017 02:00:47 +0000 (19:00 -0700)]
Set preferred PHY and read PHY implementation (3/3)
Test: manual
Bug:
30622771
Change-Id: I4267238a0b5c7bc373ae1846ebd19a716881a4ec
Myles Watson [Fri, 24 Mar 2017 00:05:14 +0000 (00:05 +0000)]
hci: Cancel timer before running callbacks am:
e7be6de450 am:
dc01e4c0f4
am:
f384911dc7
Change-Id: I49cd56678a508622c9edfa37b12f702b044cc82c
Myles Watson [Fri, 24 Mar 2017 00:03:44 +0000 (00:03 +0000)]
hci: Cancel timer before running callbacks am:
e7be6de450
am:
dc01e4c0f4
Change-Id: Ic588bd854e0365aa49c9f35b8ec0e71879d05f01
Myles Watson [Fri, 24 Mar 2017 00:02:14 +0000 (00:02 +0000)]
hci: Cancel timer before running callbacks
am:
e7be6de450
Change-Id: I96b4b1d76a9354f2564296e8b607f507e69b59e8
Myles Watson [Thu, 23 Mar 2017 18:49:13 +0000 (11:49 -0700)]
hci: Cancel timer before running callbacks
Bug:
36507488
Test: Turn Bluetooth on/off, scan for devices
Change-Id: Ia9334d83b2191504acdab50f777b6d10073226e0
Ajay Panicker [Thu, 23 Mar 2017 20:58:27 +0000 (20:58 +0000)]
Merge "Increase size of written bytes for snprintf for AT+BIND" am:
fca1242cf1 am:
7d2fc68df8
am:
65c4b0a87f
Change-Id: I7a537d99b6e1c1fcab5e5fc9e1086df269e05732
Ajay Panicker [Thu, 23 Mar 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Increase size of written bytes for snprintf for AT+BIND" am:
fca1242cf1
am:
7d2fc68df8
Change-Id: I6a8a5df14408ac09807a5e881dfe94f05e1a8283
Pavlin Radoslavov [Thu, 23 Mar 2017 20:52:39 +0000 (20:52 +0000)]
Fix a race condition inside command_timed_out() when printing log info am:
b77d7129b2 am:
fd7231f3e6
am:
099fc1c9d3
Change-Id: I1b86659b70b2514e748c9710e7292b9bacb5183f
Ajay Panicker [Thu, 23 Mar 2017 20:52:30 +0000 (20:52 +0000)]
Merge "Increase size of written bytes for snprintf for AT+BIND"
am:
fca1242cf1
Change-Id: I648cdddbc18cd94c0b2568082834b1142b666463
Pavlin Radoslavov [Thu, 23 Mar 2017 20:50:11 +0000 (20:50 +0000)]
Fix a race condition inside command_timed_out() when printing log info am:
b77d7129b2
am:
fd7231f3e6
Change-Id: I6509c9929c9f6b8725a8ca53bf207d40c41d2ada
Treehugger Robot [Thu, 23 Mar 2017 20:47:55 +0000 (20:47 +0000)]
Merge "Increase size of written bytes for snprintf for AT+BIND"
Pavlin Radoslavov [Thu, 23 Mar 2017 20:46:46 +0000 (20:46 +0000)]
Fix a race condition inside command_timed_out() when printing log info
am:
b77d7129b2
Change-Id: Ib3dd8f598b62b2706314fea6c3a17f0dac789425
Pavlin Radoslavov [Thu, 23 Mar 2017 19:24:57 +0000 (12:24 -0700)]
Fix a race condition inside command_timed_out() when printing log info
Release the lock after we don't need anymore access to the wait_entry
that was protected by the lock.
Note: We are keeping the lock right before restarting the Bluetooth
process, hence it doesn't matter we are holding it for a bit longer
than before.
Test: Code compilation
Change-Id: Id393a285fce9b9e28efcf0f55fcc32821c5a72b6
Ajay Panicker [Thu, 23 Mar 2017 18:10:12 +0000 (18:10 +0000)]
Merge "AVRCP version interop pereference (1/3)" am:
921f514bcf am:
484e89038a
am:
54666d3a5f -s ours
Change-Id: I18c6e5eda57f79f10d6e548e4bc2b13cdb49ba31
Ajay Panicker [Thu, 23 Mar 2017 18:04:04 +0000 (18:04 +0000)]
Merge "AVRCP version interop pereference (1/3)" am:
921f514bcf
am:
484e89038a
Change-Id: I3edf0eac58364069cae764bebe9805a2d3b87839
Ajay Panicker [Thu, 23 Mar 2017 17:57:48 +0000 (17:57 +0000)]
Merge "AVRCP version interop pereference (1/3)"
am:
921f514bcf
Change-Id: Ia500beaee28b4c335be5367f8b3f8f564ac70e8e
Treehugger Robot [Thu, 23 Mar 2017 17:49:56 +0000 (17:49 +0000)]
Merge "AVRCP version interop pereference (1/3)"
Myles Watson [Thu, 23 Mar 2017 13:31:31 +0000 (13:31 +0000)]
Merge "main: Update error handling" am:
5d637bc524 am:
8bfe9d8cc3
am:
20f32ab121
Change-Id: Idc0233581f04c87a7387a28a71706b0356f84f35
Myles Watson [Thu, 23 Mar 2017 13:29:01 +0000 (13:29 +0000)]
Merge "main: Update error handling" am:
5d637bc524
am:
8bfe9d8cc3
Change-Id: I9f68865c85de59807fee31ef891bda01fbfaf7f3
Myles Watson [Thu, 23 Mar 2017 13:26:01 +0000 (13:26 +0000)]
Merge "main: Update error handling"
am:
5d637bc524
Change-Id: I77b8d202d395d26fbc8a1ae664d7b1b090ff1ba8
Treehugger Robot [Thu, 23 Mar 2017 13:21:52 +0000 (13:21 +0000)]
Merge "main: Update error handling"
Ajay Panicker [Wed, 15 Feb 2017 20:23:35 +0000 (12:23 -0800)]
Increase size of written bytes for snprintf for AT+BIND
snprintf includes the null terminator for size of string to write to buffer.
Having a buffer size of one would only write a null terminator.
Bug:
35348420
Test: HFP Test with carkit
Change-Id: Id81abca562259371520b891e84ec76f6cb434b0c
Ajay Panicker [Sat, 18 Mar 2017 21:58:06 +0000 (14:58 -0700)]
AVRCP version interop pereference (1/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.
Bug:
35956792
Test: Select AVRCP version through developer option
Merged-In: Ib55af4406131178846d38ef4da33fb72cb2cd02f
Change-Id: Ib55af4406131178846d38ef4da33fb72cb2cd02f
Ajay Panicker [Sat, 18 Mar 2017 21:58:06 +0000 (14:58 -0700)]
AVRCP version interop pereference (1/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.
Bug:
35956792
Test: Select AVRCP version through developer option
Change-Id: Ib55af4406131178846d38ef4da33fb72cb2cd02f
Ivan Podogov [Wed, 22 Mar 2017 00:43:14 +0000 (00:43 +0000)]
Reduce sniff intervals for active mode. am:
be6d6ce0ae am:
947d36410a
am:
b1ff150c92
Change-Id: I2404db4b449d31d5f676a6ec62e9a725e1a40060
Ivan Podogov [Wed, 22 Mar 2017 00:31:05 +0000 (00:31 +0000)]
Reduce sniff intervals for active mode. am:
be6d6ce0ae
am:
947d36410a
Change-Id: I216fee30474f8d28579c45412cdefc57335a938f
Ivan Podogov [Wed, 22 Mar 2017 00:26:42 +0000 (00:26 +0000)]
Reduce sniff intervals for active mode.
am:
be6d6ce0ae
Change-Id: Icb81474e5702aaaacca9d4edcf273cd99e46a64f
Ivan Podogov [Tue, 3 Jan 2017 21:20:33 +0000 (21:20 +0000)]
Reduce sniff intervals for active mode.
According to the Bluetooth HID specification, a pointing device
should have a recommended report rate of approximately 80 Hz, and
sniff interval of 18 slots for the sniff subrating mode.
Current settings set the sniff interval to 54 slots, which is
aproximately 29.6 Hz - not really enough to emulate a mouse.
Test: with a pointing device app
Change-Id: Ic3365137bcf3f5608ada37fbfa0c3233f6ef83d7
Jacky Cheung [Fri, 17 Mar 2017 17:21:40 +0000 (10:21 -0700)]
DO NOT MERGE ANYWHERE Mark AutoConnParamUpdateAddr on first auto connection param update
In the case that AutoConnParamUpdateAddr is missing, the first LE address
that performs the connection parameter update is inferred as the companion.
The address is recorded in AutoConnParamUpdateAddr.
BUG:
34693438
Change-Id: I2a6e0b10a4debe1e5f36052f67864854da0b3e47
Myles Watson [Tue, 21 Mar 2017 17:24:20 +0000 (10:24 -0700)]
main: Update error handling
Test: builds
Change-Id: Ibc6b1d94f49bd711e7844ae769c384f76d357f22
Alex Deymo [Mon, 20 Mar 2017 22:47:48 +0000 (22:47 +0000)]
Merge "Add liblog dependency to libbt-vendor." am:
cc7837d8d0 am:
d637951160
am:
9f075fe265
Change-Id: I0be7a549c665082d1766bcf6c1e18cc901497661
Alex Deymo [Mon, 20 Mar 2017 22:47:19 +0000 (22:47 +0000)]
Merge "Add liblog dependency to libbt-vendor." am:
cc7837d8d0
am:
d637951160
Change-Id: Ic3ad685345a67a9bb68df4382060b8530c0cc6f1
Alex Deymo [Mon, 20 Mar 2017 22:44:01 +0000 (22:44 +0000)]
Merge "Add liblog dependency to libbt-vendor."
am:
cc7837d8d0
Change-Id: I4b9035bf3faad26a48020f78e05e5971d2b76248
Jakub Pawlowski [Mon, 20 Mar 2017 22:41:26 +0000 (22:41 +0000)]
Bluetooth 5 AdvertisingSet implementation (4/4) am:
ff32af6dee am:
1d86b96865
am:
299dd3b8fe
Change-Id: I2194b7b621d555791d6f7828ec769c607a966c13
Jakub Pawlowski [Mon, 20 Mar 2017 22:41:20 +0000 (22:41 +0000)]
Report back TX Power value am:
256afc4d84 am:
bf67a6c50f
am:
7dfb9b9584
Change-Id: I543bc9f2622d2e9582da84108076f42bf7bf938e
Treehugger Robot [Mon, 20 Mar 2017 22:35:18 +0000 (22:35 +0000)]
Merge "Add liblog dependency to libbt-vendor."
Jakub Pawlowski [Mon, 20 Mar 2017 22:33:27 +0000 (22:33 +0000)]
Bluetooth 5 AdvertisingSet implementation (4/4) am:
ff32af6dee
am:
1d86b96865
Change-Id: Ifbeb1e425774a43584cc9a781a556fcba3b6a9b9
Jakub Pawlowski [Mon, 20 Mar 2017 22:33:22 +0000 (22:33 +0000)]
Report back TX Power value am:
256afc4d84
am:
bf67a6c50f
Change-Id: Ie21ea5fad3bada76b1ad2fc9eee535f39068edc8
Jakub Pawlowski [Mon, 20 Mar 2017 22:27:00 +0000 (22:27 +0000)]
Bluetooth 5 AdvertisingSet implementation (4/4)
am:
ff32af6dee
Change-Id: I053c63b9a109d62c0c7a22e5a4088bae39e4bf23
Jakub Pawlowski [Mon, 20 Mar 2017 22:26:55 +0000 (22:26 +0000)]
Report back TX Power value
am:
256afc4d84
Change-Id: If05533867f2f78762b42e8e68fdecc1eed3cb22f
Jakub Pawlowski [Sat, 18 Mar 2017 01:05:38 +0000 (18:05 -0700)]
Bluetooth 5 AdvertisingSet implementation (4/4)
Test: manual
Bug:
30622771
Change-Id: Ie1c1588383a83296cabd29a0481f7d80a1168263
Jakub Pawlowski [Mon, 20 Mar 2017 22:18:17 +0000 (22:18 +0000)]
Do not use Multi-Adv instance 0 in VSC am:
10661946cc am:
c914c6c1ae
am:
89373711d0
Change-Id: Ife43fb0cebebd109950f4a66bb5cd364dc13b2ee
Jakub Pawlowski [Mon, 20 Mar 2017 22:14:46 +0000 (22:14 +0000)]
Do not use Multi-Adv instance 0 in VSC am:
10661946cc
am:
c914c6c1ae
Change-Id: Id1019ba5f61cc252848800de0c03b616dacf4588
Jakub Pawlowski [Fri, 17 Mar 2017 19:31:42 +0000 (12:31 -0700)]
Report back TX Power value
For LE Extended Advertising report the value returned by controller.
For VSC Advertising return the value send to controller.
For Legacy Advertising use 0.
Test: manual
Bug:
30622771
Change-Id: Ifc49af86e7f064c91ed2d20e6f87532159d1bffa
Jakub Pawlowski [Mon, 20 Mar 2017 22:11:16 +0000 (22:11 +0000)]
Do not use Multi-Adv instance 0 in VSC
am:
10661946cc
Change-Id: I76ca92cbc2161e44493df2f0ec329117f8ca0492
Jakub Pawlowski [Mon, 20 Mar 2017 17:33:25 +0000 (10:33 -0700)]
Do not use Multi-Adv instance 0 in VSC
Bug:
36365653
Test: manual
Change-Id: If44b2f0206bab91fa77f2a1ff68d83e1593f28e2
Ajay Panicker [Mon, 20 Mar 2017 21:31:36 +0000 (21:31 +0000)]
Merge "Change default AVRCP version to 1.4" am:
763839680f am:
72c146a3a6
am:
e090477309
Change-Id: If69c4a1d62133eba1d123c52fe460256991279c7
Ajay Panicker [Mon, 20 Mar 2017 21:28:05 +0000 (21:28 +0000)]
Merge "Change default AVRCP version to 1.4" am:
763839680f
am:
72c146a3a6
Change-Id: Idb76c55b74e2f0ead0d37acdab90290edea4a269
Ajay Panicker [Mon, 20 Mar 2017 21:24:37 +0000 (21:24 +0000)]
Merge "Change default AVRCP version to 1.4"
am:
763839680f
Change-Id: I59aae13d6a7e8c61659a135861be0fb7e448fc72
Treehugger Robot [Mon, 20 Mar 2017 21:19:05 +0000 (21:19 +0000)]
Merge "Change default AVRCP version to 1.4"
Alex Deymo [Mon, 20 Mar 2017 20:55:10 +0000 (13:55 -0700)]
Add liblog dependency to libbt-vendor.
lubcutils doesn't bundle liblog anymore. This fixes the build in boards
defining BOARD_HAVE_BLUETOOTH_LINUX.
Bug: None
Test: `make droid` in such board.
Change-Id: Ic9b7ba045c3a291eb33a606ffabc41c45c9ca3e2