OSDN Git Service
Sunny Kapdi [Wed, 2 Aug 2017 17:13:59 +0000 (17:13 +0000)]
Merge "AE: Set secondary adv max skip to zero"
am:
b92d9f3530
Change-Id: I54710829a6ba81d69bbee4571c00492d4a612e32
Treehugger Robot [Wed, 2 Aug 2017 17:08:20 +0000 (17:08 +0000)]
Merge "AE: Set secondary adv max skip to zero"
jruthe [Wed, 2 Aug 2017 02:14:34 +0000 (02:14 +0000)]
test_vendor: Rename discoverable devices.
am:
974b1f9a91
Change-Id: I2252dd34fa376c4aa3e6da49b0f5f75f59d05837
jruthe [Tue, 1 Aug 2017 23:44:15 +0000 (16:44 -0700)]
test_vendor: Rename discoverable devices.
Test: compiles
Change-Id: I1fc1f6845995e9e816556679622db6f6d447b7b3
Sunny Kapdi [Tue, 13 Jun 2017 19:20:04 +0000 (12:20 -0700)]
AE: Set secondary adv max skip to zero
Setting secondary adv max skip to zero to guarantee
when the AUX Tx happens. This way the App can use the
primary advertising interval to dictate the AUX Tx
interval.
Bug:
62552121
Change-Id: Id66222e4f8a583c42acafb6532f81a817504e606
Subramanian Srinivasan [Tue, 1 Aug 2017 06:06:15 +0000 (06:06 +0000)]
Merge "Fix processing of Inquiry results data"
am:
67da9a5e19
Change-Id: If6b7523e9096c114263baf7a065f023186818c82
Treehugger Robot [Tue, 1 Aug 2017 05:59:41 +0000 (05:59 +0000)]
Merge "Fix processing of Inquiry results data"
Satish Kodishala [Tue, 1 Aug 2017 03:25:34 +0000 (03:25 +0000)]
Use the correct AVDTP version-specific features
am:
9cd9ef4c38
Change-Id: I85e816084a49a0a3438c8cc88fe2ab0ef32097f2
Satish Kodishala [Fri, 24 Feb 2017 09:39:01 +0000 (15:09 +0530)]
Use the correct AVDTP version-specific features
Failure:
A2DP is not reconnected after power cycling DUT BT.
Root cause:
AVDTP v1.3 feature request (AVDT_GetAllCapReq) sent by DUT
as remote supports the same, but this 1.3 feature is not
completely supported by DUT which leads to erroneous behavior.
Fix:
Use AVDT_GetAllCapReq request only when both host and remote
AVDTP version are 1.3 and above.
Test: 1.Pair to CarKit; 2.Connect to CarKit; 3.Do BT power cycle @ DUT
Bug:
35657623
Change-Id: I66c2d7d8fe8506b74282bcca93595e1cbf5c2565
Subramanian Srinivasan [Fri, 26 May 2017 00:05:11 +0000 (17:05 -0700)]
Fix processing of Inquiry results data
Process inquiry results data based on the data
length sent from the lower stack layers and not
by using HCI_EXT_INQ_RESPONSE_LEN.
Bug:
62589724
Change-Id: Iee4a2c8f0dfb459404b28ba21061f7ced9f8455c
Pavlin Radoslavov [Mon, 31 Jul 2017 18:08:21 +0000 (18:08 +0000)]
Fix the MAC address for INTEROP_2MBPS_LINK_ONLY entry
am:
b60955f9c7
Change-Id: I06a99e795b0ddfd6978fca2ccca09f20de3d299f
Pavlin Radoslavov [Mon, 31 Jul 2017 03:18:57 +0000 (20:18 -0700)]
Fix the MAC address for INTEROP_2MBPS_LINK_ONLY entry
Bug:
62394764
Test: Code compilation
Change-Id: I3e6d8bb8258d6cc56ce05d7f17dda445859f011a
Pavlin Radoslavov [Fri, 28 Jul 2017 19:29:43 +0000 (19:29 +0000)]
Add interoperability mechanism to restrict the AVDTP MTU for AAC codec
am:
b866da0bc1
Change-Id: I79d73807f18ca5f21050f72b16c0e6f6f972f0fb
Pavlin Radoslavov [Fri, 28 Jul 2017 02:19:32 +0000 (19:19 -0700)]
Add interoperability mechanism to restrict the AVDTP MTU for AAC codec
Also, add an interoperability entry for devices that are known
to have AAC-related issues.
Test: A2DP streaming to Headsets
Bug:
63725151
Change-Id: Ic9b6640da44ebc28bfa63a19a87f0543d69bc576
Matadeen Mishra [Thu, 27 Jul 2017 02:29:36 +0000 (02:29 +0000)]
Retry authentication in key-missing or pairing collision use case
am:
a95a6a3608
Change-Id: Iad1f7b2b5cc32fe6bb7e7237a4652ba7b2ed4e78
Matadeen Mishra [Fri, 17 Feb 2017 07:10:53 +0000 (12:40 +0530)]
Retry authentication in key-missing or pairing collision use case
Problem:
A2DP connection failing with connection timeout
Steps:
1. Pair and connect car kit from DUT
2. Disconnect the car kit from DUT
3 Unpair DUT from car kit menu and initiate pairing from car kit.
Pairing and A2DP connection should be successful.
Failure:
Paring and A2DP connections fail
Root Cause:
As the stack posting authentication failure to upper layers
when SOC gives key missing error code remote removed from
DUT paired list, but same time lower layers keep retrying
for missing key and leading to connection failure.
Fix:
Don't post authentication complete to upper layers when stack
re trying for security in key missing or transaction collision cases
Test: manual
Bug:
35448920
Change-Id: I970c8679bf27801fe46f8dd757d6435ed500f77f
(cherry picked from commit
35752e32fb5d859c012f6d06f2c22fa6b1f84174)
Eric Laurent [Wed, 26 Jul 2017 20:19:29 +0000 (20:19 +0000)]
Merge "Revert "bt: Update libchrome APIS to r456626.""
am:
6241dd5522
Change-Id: I2ab440ec5601a01717428b0ad8faf135437af971
Eric Laurent [Wed, 26 Jul 2017 20:02:18 +0000 (20:02 +0000)]
Merge "Revert "bt: Update libchrome APIS to r456626.""
Pavlin Radoslavov [Wed, 26 Jul 2017 19:56:48 +0000 (19:56 +0000)]
Merge "Use a mutex to protect the consistency of the tBTA_PM_TIMER state"
am:
02ce3f8f52
Change-Id: I61dbfa463046af52f30385bb2593709b0f8e7730
Treehugger Robot [Wed, 26 Jul 2017 19:48:05 +0000 (19:48 +0000)]
Merge "Use a mutex to protect the consistency of the tBTA_PM_TIMER state"
Joseph Pirozzo [Wed, 26 Jul 2017 18:35:19 +0000 (18:35 +0000)]
Merge "HFP Client connect Audio"
am:
d568679105
Change-Id: Ie8b2a8b3b0d54d10fb99017d6f34649004033a5c
Treehugger Robot [Wed, 26 Jul 2017 18:30:08 +0000 (18:30 +0000)]
Merge "HFP Client connect Audio"
Stanley Tng [Wed, 26 Jul 2017 18:04:58 +0000 (18:04 +0000)]
Merge "Remove unwanted space characters from dialing number"
am:
ac3faef9da
Change-Id: I1209591467468e7b5b5cc77b04c759b02b3b7b67
Treehugger Robot [Wed, 26 Jul 2017 17:50:46 +0000 (17:50 +0000)]
Merge "Remove unwanted space characters from dialing number"
Luis Hector Chavez [Wed, 26 Jul 2017 17:36:20 +0000 (17:36 +0000)]
Revert "bt: Update libchrome APIS to r456626."
This reverts commit
014890b74878022db7d23be47db179ba06e01856.
Reason for revert: Broke the mac_sdk
Exempt-From-Owner-Approval: Fixing mac_sdk
Change-Id: I11652839faf8430a7ee6ad64af0a7bd6985478e8
Pavlin Radoslavov [Wed, 26 Jul 2017 06:55:04 +0000 (23:55 -0700)]
Use a mutex to protect the consistency of the tBTA_PM_TIMER state
Bug:
63689331
Test: Code compilation
Change-Id: Id8ab78473e1f766d5a76b967024b7ff4af499667
Jay Civelli [Wed, 26 Jul 2017 01:53:56 +0000 (01:53 +0000)]
bt: Update libchrome APIS to r456626.
am:
014890b748
Change-Id: Iaba9b51fa55e72df01bcdb46c10dcf46d11a6856
Joseph Pirozzo [Thu, 29 Jun 2017 21:23:01 +0000 (14:23 -0700)]
HFP Client connect Audio
Listen for incomming SCO connections any time the Hands Free Profile is
connected to a phone. Additionally allow eSCO connections on devices
that only support the standard SBC audio codec.
Bug:
62086689
Test: pair and connect a phone via HFP then start a phonecall and
enable and disable audio routing through BT observe that the connection
is established everytime.
Change-Id: I11319a4a85f8c9d36114a6fc09da0f0b8da16672
Stanley Tng [Tue, 25 Jul 2017 17:07:05 +0000 (10:07 -0700)]
Remove unwanted space characters from dialing number
Certain car kits might send an AT command with space characters in
the dialing number. This commit adds a workaround to trim these unwanted
space characters.
Bug:
6340999
Test: Manual test with a car kit but purposely added numbers with spaces.
Change-Id: I9c238bc625fff8503c45cbbfaeb8bdd15b8a7d9a
Jay Civelli [Mon, 27 Mar 2017 16:53:18 +0000 (09:53 -0700)]
bt: Update libchrome APIS to r456626.
The new libchrome has been ported from Chromium and some APIs
have changed. Make necessary changes at call sites.
Change-Id: If5ea3659905f485fd0513c75e9d4f7c99b390c16
Myles Watson [Sat, 22 Jul 2017 03:46:50 +0000 (03:46 +0000)]
Merge "test_vendor: Add base implementation"
am:
f246f94a5b
Change-Id: I94550ef296e9d70739d16711c5f4601e6541df3a
Treehugger Robot [Sat, 22 Jul 2017 03:42:59 +0000 (03:42 +0000)]
Merge "test_vendor: Add base implementation"
Colin Cross [Fri, 21 Jul 2017 23:02:59 +0000 (23:02 +0000)]
Merge "Remove static library from required modules list"
am:
01e400f210
Change-Id: Idfb829105260ecefb777c0172ca8572e603a51b8
Treehugger Robot [Fri, 21 Jul 2017 22:57:44 +0000 (22:57 +0000)]
Merge "Remove static library from required modules list"
jruthe [Fri, 21 Jul 2017 20:23:00 +0000 (20:23 +0000)]
Merge "test_vendor: Change assemble function parameters"
am:
2f75d93cf3
Change-Id: I8d1d6e37aba524ca32ef9662404075015e28d8ab
johnshamoon [Fri, 21 Jul 2017 20:22:38 +0000 (20:22 +0000)]
Fix build by adding bt_types to bluetooth.h (1/2)
am:
66676ad1e6
Change-Id: I66cd02627b3920df81069e5e0b9ec102f2394257
Treehugger Robot [Fri, 21 Jul 2017 20:18:14 +0000 (20:18 +0000)]
Merge "test_vendor: Change assemble function parameters"
Myles Watson [Wed, 17 May 2017 18:39:18 +0000 (11:39 -0700)]
test_vendor: Add base implementation
test_vendor: Add Device and Beacon classes
Device contains properties to be modeled. Beacon
is a simple class that inherits from Device.
test_vendor: Add a Device factory
The device factory calls the constructors and initializes
the devices. The controller uses the factory to instantiate
devices.
test_vendor: Add a Keyboard class
Add a connectable LE device.
test_vendor: Add BrokenAdv device
Generate random broken advertisements.
test_vendor: Add scanning and connections
Add a connection class to handle data transfer.
Add scanning and connections in the controller.
Test: Compiles
Change-Id: Id9f64308447c9de4e83a2a4fa9f59c30bede75ab
jruthe [Mon, 17 Jul 2017 23:09:12 +0000 (16:09 -0700)]
test_vendor: Change assemble function parameters
Update L2cap::assemble to take a vector of unique_ptrs to L2capSdus rather than
a vector of L2capSdu objects.
Test: Passes assemble tests in test/l2cap_tests.cc
Change-Id: I909ccb9fde6d36a7dbeb6c6d7c3d8751fe58d5f0
johnshamoon [Fri, 21 Jul 2017 17:18:58 +0000 (10:18 -0700)]
Fix build by adding bt_types to bluetooth.h (1/2)
Allow bt_types to be included as a shared or static library.
Test: Compiles
Change-Id: I24bc3dafaddd83405bd0bfa37fd5df5b4238f253
Pavlin Radoslavov [Fri, 21 Jul 2017 03:14:10 +0000 (03:14 +0000)]
Merge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)""
am:
0382042e18
Change-Id: Icead26b39ebb7d3b0dcc83f22c9406fee8c997e9
Treehugger Robot [Fri, 21 Jul 2017 03:07:54 +0000 (03:07 +0000)]
Merge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)""
Andre Eisenbach [Fri, 21 Jul 2017 02:41:06 +0000 (02:41 +0000)]
Merge "Reduce error conditions which cause link key deletion on auth complete"
am:
7c17ea31ff
Change-Id: I9df2b69da085249f5299950bc763ff91f6e45bda
Treehugger Robot [Fri, 21 Jul 2017 02:37:11 +0000 (02:37 +0000)]
Merge "Reduce error conditions which cause link key deletion on auth complete"
Pavlin Radoslavov [Fri, 21 Jul 2017 02:22:36 +0000 (02:22 +0000)]
Fix the interoperability mechanism for 2Mbps-only links for audio
am:
0dec1807c6
Change-Id: I8de36170a91d4d15dbb97de4392b9943b8ec1531
Andre Eisenbach [Wed, 19 Jul 2017 22:33:07 +0000 (15:33 -0700)]
Reduce error conditions which cause link key deletion on auth complete
This inverts previous conditions which attempt to limit what error
conditions cause link key deletion and instead of excluding error codes
it provides a shorter list of codes which actually DO cause link key
deletion.
As a result, temporary failures caused by page timeouts, random
disconnects etc. should no longer cause link key deletion by accident.
Fixes:
63507123
Test: manual
Change-Id: I8d51403b8d233a3c335313b8f257a562c3d01109
Pavlin Radoslavov [Fri, 21 Jul 2017 00:51:07 +0000 (00:51 +0000)]
Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"
This reverts commit
9eee3a772b3f23e5c33845422203f0dec07be234.
Not needed anymore - handled by the interoperability database.
Bug:
62394764
Bug:
34127145
Test: Audio streaming to headset that supports 3Mbps
Change-Id: I143c07c171e0fe9ef882c5e506545187f9e41498
Pavlin Radoslavov [Fri, 21 Jul 2017 00:00:36 +0000 (17:00 -0700)]
Fix the interoperability mechanism for 2Mbps-only links for audio
Also, added two new entries to the INTEROP_2MBPS_LINK_ONLY
interoperability database.
Bug:
62394764
Test: Audio streaming to headset that supports 3Mbps
Change-Id: Idaa25e18c0b017d8859aab723244fdc2613fc159
Jacky Cheung [Thu, 20 Jul 2017 16:14:24 +0000 (16:14 +0000)]
Add additional LE transport lookup in BTM_ReadRSSI for DUMO device
am:
5154ea8a5c
Change-Id: Ie678f53e4e9dd711ffe11dd9b5c251f04dd315d6
Jacky Cheung [Thu, 20 Jul 2017 00:21:13 +0000 (17:21 -0700)]
Add additional LE transport lookup in BTM_ReadRSSI for DUMO device
Bug:
63391975
Test: CTS Bluetooth LE Secure Client Test
Change-Id: Ibde19dcef9dbd4b344771835fe5521d1f83c638a
jruthe [Wed, 19 Jul 2017 22:10:16 +0000 (22:10 +0000)]
Merge "test_vendor: Fragment tests"
am:
7453a5d341
Change-Id: If10528953ba17e74851d28c079e8ed321f869209
Treehugger Robot [Wed, 19 Jul 2017 22:01:48 +0000 (22:01 +0000)]
Merge "test_vendor: Fragment tests"
Myles Watson [Wed, 19 Jul 2017 21:40:44 +0000 (21:40 +0000)]
test_vendor: Move include to .cc file
am:
8769e8e923
Change-Id: Iebdef1bd24f4ae9710df389fef482afd035aced7
Myles Watson [Tue, 7 Mar 2017 13:02:01 +0000 (05:02 -0800)]
test_vendor: Move include to .cc file
Test: compile
Change-Id: Ib13830f92c305bcd9d7e688d0d4dba78499b1f5b
jruthe [Wed, 19 Jul 2017 00:28:20 +0000 (00:28 +0000)]
Merge "test_vendor: Implement L2CAP packet fragmentation"
am:
3dc90dd77e
Change-Id: I99e34e131e5735a676c7e8dc1ea1d902544213d4
Treehugger Robot [Wed, 19 Jul 2017 00:19:25 +0000 (00:19 +0000)]
Merge "test_vendor: Implement L2CAP packet fragmentation"
Andre Eisenbach [Wed, 19 Jul 2017 00:01:59 +0000 (00:01 +0000)]
Do not delete pairing on HCI connection timeout
am:
f54d7e2719
Change-Id: I3d56d141385c5d04b919baa2c4360ed242c2bc0f
jruthe [Thu, 8 Jun 2017 22:33:32 +0000 (15:33 -0700)]
test_vendor: Implement L2CAP packet fragmentation
Added functions to fragment an L2CAP packet into SDUs of variable size.
Test: Passes all of the tests in test/l2cap_test.cc
Change-Id: Id39042c32594c2e9f54e98def432f8d1655a3b41
jruthe [Fri, 7 Jul 2017 22:31:45 +0000 (15:31 -0700)]
test_vendor: Fragment tests
Test: compiles
Change-Id: I55c121b5ca97801b37315126164aa01ef3db45d0
Andre Eisenbach [Tue, 18 Jul 2017 22:13:55 +0000 (15:13 -0700)]
Do not delete pairing on HCI connection timeout
Change-Id: I67121f3f6d34cd82e243af11ecd735684c4ca67d
Fixes:
63796670
Test: manual
jruthe [Mon, 17 Jul 2017 23:27:18 +0000 (23:27 +0000)]
test_vendor: Add LOG_DEBUG to L2cap::assemble
am:
8d604d6ab0
Change-Id: I2220cab6e3a1348d0bdf640e941b11d3f2600b3c
jruthe [Mon, 17 Jul 2017 18:27:35 +0000 (11:27 -0700)]
test_vendor: Add LOG_DEBUG to L2cap::assemble
Test: compiles
Change-Id: I8753215d00610dfe3ef43a09108362f94402c941
jruthe [Mon, 17 Jul 2017 17:46:47 +0000 (17:46 +0000)]
test_vendor: Move SDU checks to L2capSdu
am:
7d267611a4
Change-Id: I71c55861389356e6cf83ac335cfb558d954c0b6a
jruthe [Thu, 13 Jul 2017 23:56:25 +0000 (16:56 -0700)]
test_vendor: Move SDU checks to L2capSdu
Move functions that check the Segmentation and Reassembly bits of the
control field of SDU packets into the L2capSdu class from the
L2capPacket class.
Test: compiles
Change-Id: I0afc60fcf30d29b5021ddd9afa1c7320fca64969
liuchao [Mon, 17 Jul 2017 16:40:47 +0000 (16:40 +0000)]
Merge "Add LEN_UUID_128 type check while build UUID seq"
am:
48942c700e
Change-Id: I7cc27fba28afadfafe62b726af07eb37ecdba9b4
Treehugger Robot [Mon, 17 Jul 2017 16:31:23 +0000 (16:31 +0000)]
Merge "Add LEN_UUID_128 type check while build UUID seq"
Jakub Pawlowski [Sat, 15 Jul 2017 07:48:32 +0000 (07:48 +0000)]
Linux build fix
am:
d3988fd73c
Change-Id: I6f284cdecd4a45dc1c23f218b42d2f472865ef66
Jakub Pawlowski [Sat, 15 Jul 2017 04:08:47 +0000 (21:08 -0700)]
Linux build fix
Test: build on linux using ninja
Change-Id: I3b0102814433ca88611fbc863271fe065d443c68
johnshamoon [Sat, 15 Jul 2017 04:05:19 +0000 (04:05 +0000)]
test_vendor: Add L2cap and L2capSdu assemble tests
am:
7552c35aec
Change-Id: Ibc8c535d8f5f366a47307eb2e782671fc8033533
johnshamoon [Tue, 13 Jun 2017 22:33:55 +0000 (15:33 -0700)]
test_vendor: Add L2cap and L2capSdu assemble tests
Test: Run the unit tests:
out/host/linux-x86/nativetest64/test-vendor_test_host/\
test-vendor_test_host --gtest_filter=L2capTest.*
Change-Id: I89ff2e6bbcfb58c53d872bfef007e487c2f4e3ae
Jakub Pawlowski [Sat, 15 Jul 2017 00:31:36 +0000 (00:31 +0000)]
Merge "Advertise data parser - allow zero padding at end of packet"
am:
c45e5d2dca
Change-Id: Ibaf9dfc4bc0ef9c8889be008daed9be24eaddf5d
Treehugger Robot [Sat, 15 Jul 2017 00:23:48 +0000 (00:23 +0000)]
Merge "Advertise data parser - allow zero padding at end of packet"
jruthe [Fri, 14 Jul 2017 22:55:26 +0000 (22:55 +0000)]
test_vendor: L2cap Assemble additional error check
am:
16995c3a50
Change-Id: I7eae4a86ff91426c76c2a51fa3fcdae0cfdfb4b9
liuchao [Wed, 12 Apr 2017 01:33:21 +0000 (09:33 +0800)]
Add LEN_UUID_128 type check while build UUID seq
Some devices send UUIDs of invalid lengths or the length is corrupted
because of other corruption and we should fail.
Test: mm -j8
Change-Id: I2fb808282b403be7a402228f01da43790997ad65
Jakub Pawlowski [Fri, 14 Jul 2017 22:37:57 +0000 (15:37 -0700)]
Advertise data parser - allow zero padding at end of packet
Test: AdvertiseDataParserTest
Bug:
63123881
Change-Id: I8be9e693de557951b1048840759b5658331e9b3b
jruthe [Tue, 11 Jul 2017 21:09:51 +0000 (14:09 -0700)]
test_vendor: L2cap Assemble additional error check
Assemble now properly checks the proposed length of a segmented SDU that
is given in the first packet of any segmented SDU in accordance with
Bluetooth Core Specification Version 4.2 Volume 3 Part A 3.3.2
Test: Passed in test/l2cap_test.cc
Change-Id: Idbbd1c014bac8928affab581118f73a7d9126824
jruthe [Fri, 14 Jul 2017 02:33:12 +0000 (02:33 +0000)]
test_vendor: Rename L2cap class to L2capPacket
am:
d930fac3df
Change-Id: I0be5142270dedcb774a2ba00ca1e670329d222b9
jruthe [Thu, 13 Jul 2017 23:09:59 +0000 (16:09 -0700)]
test_vendor: Rename L2cap class to L2capPacket
Test: Compiles
Change-Id: I851d2af8bfeb906cee754531e72e94a832413194
Timm Korte [Thu, 13 Jul 2017 00:15:03 +0000 (00:15 +0000)]
Merge "bt: fix sdp service name by removing NULL char"
am:
2766da83df
Change-Id: I57de21a3a368cfc0312cce5498bb0beb70ae5cc2
Treehugger Robot [Thu, 13 Jul 2017 00:09:27 +0000 (00:09 +0000)]
Merge "bt: fix sdp service name by removing NULL char"
Jakub Pawlowski [Wed, 12 Jul 2017 22:55:28 +0000 (22:55 +0000)]
Make GATT server code more readable
am:
b4e4799154
Change-Id: I4ef576808d9f258a45f3158a94f285035944f1cc
Timm Korte [Mon, 15 May 2017 06:30:00 +0000 (08:30 +0200)]
bt: fix sdp service name by removing NULL char
The Bluedroid stack uses a C string with terminating NULL char as a
service name. Since in BT, strings are TLV encoded (type, length,
value), this doesn't make sense.
Simple fix is to copy the string without the trailing NULL by
removing the "+1" after the strlen call when passing the string as
uint8_t array to the lower level functions.
The current behaviour keeps some older devices from being able to
connect to an Android providing a Serial Port profile due to having
the wrong service name (that is, including a NULL at the end instead
of the correct string).
Test: Checked against Linux BlueZ, which does not include this extra
null character.
Change-Id: I6a43024ff89ac09e4b2d2e5cfb407b6e9323f0bd
Signed-off-by: Timm Korte <timm.korte@gmail.com>
Jakub Pawlowski [Tue, 11 Jul 2017 22:36:48 +0000 (15:36 -0700)]
Make GATT server code more readable
Test: compilation test
Change-Id: Ia176d7a89ccb9590c80e5b6b8af5a3495bf2ab16
jruthe [Tue, 11 Jul 2017 21:22:51 +0000 (21:22 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs"
am:
2dd6b59d57
Change-Id: If0995021d9201b91acaf49a891e2682e5a4f855e
Treehugger Robot [Tue, 11 Jul 2017 21:16:16 +0000 (21:16 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs"
Jack He [Tue, 11 Jul 2017 20:24:11 +0000 (20:24 +0000)]
GATT: Expose opportunistic client API to Java
am:
5120fedf20
Change-Id: I96347363962687799e5ca56feefc40eef56ae7e2
jruthe [Thu, 8 Jun 2017 22:33:32 +0000 (15:33 -0700)]
test_vendor: Implement packet assembly for SDUs
Created l2cap.* and l2cap_sdu.* for assembling an L2CAP packet from a
stream of SDU packets.
Test: Passed all tests in l2cap_test.cc and l2cap_sdu_test.cc
Change-Id: I64487ee67170b1dd4eda9555321b1ecf7ed57040
Jack He [Thu, 29 Jun 2017 20:58:47 +0000 (13:58 -0700)]
GATT: Expose opportunistic client API to Java
* Opportunistic GATT connection allows system service to subscribe to
characteristic notifications without holding the BLE connection
* Exposing this flag to Java allows Android applications to use it
Bug:
35874078
Test: make, test on Android App
Change-Id: Ic470acd63bf45d1c33696abed1e93b30746fb7a2
Jiyong Park [Fri, 7 Jul 2017 06:33:15 +0000 (06:33 +0000)]
Merge "Mark libbluetooth-types as vendor_available"
am:
29f359181a
Change-Id: Ic63d5ccafceb91f2eddf3a41c8a3b8be6d200b0c
Treehugger Robot [Fri, 7 Jul 2017 06:27:41 +0000 (06:27 +0000)]
Merge "Mark libbluetooth-types as vendor_available"
Jinguang Dong [Fri, 7 Jul 2017 06:02:43 +0000 (06:02 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING
am:
549ec693c2
Change-Id: I8c9ea5fad01fbb68b9f7067f7682cc9cd870daa2
Jinguang Dong [Wed, 28 Jun 2017 01:50:37 +0000 (09:50 +0800)]
Do not delete device record on HCI_ERR_KEY_MISSING
If an auth_complete event is received with HCI_ERR_KEY_MISSING, the
p_dev_rec->sm4 flag will be set to "BTM_SM4_UNKNOWN" in the
BTM_SecClearSecurityFlags() function. This will prevent the
BTM_SM4_RETRY procedure from being executed, which can cause
pairing failures.
To reproduce:
1. Two Phones, A: Android O, B: Android N.
2. Enable B in Bluetooth visable mode
3. A start discovery and create pairing with B successfully
4. B cancel pairing with A by remove A from pairing device
list of B.
5. A create paring with B again by touch paired device in A,
this first step will be failed.
Bug:
62615213
Test: manual
Change-Id: I514ba2f4d0fd2621c11bd83aeec24b8c6c6d2d5a
Signed-off-by: Yequan Song <songyequan@huawei.com>
Jiyong Park [Fri, 7 Jul 2017 04:29:16 +0000 (13:29 +0900)]
Mark libbluetooth-types as vendor_available
libbluetooty-types is used by a vendor module
android.hardware.bluetooth@1.0-service.sim, thus marking it as
vendor_available so that the lib is allowed for the HAL service when
building with BOARD_VNDK_VERSION.
Bug:
37342627
Test: BOARD_VNDK_VERSION=current m -j
android.hardware.bluetooth@1.0-service.sim
Change-Id: I39d071fc249ce6842e7175751abd6249b9367231
Android Build Merger (Role) [Fri, 7 Jul 2017 01:37:41 +0000 (01:37 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
Jakub Pawlowski [Fri, 7 Jul 2017 01:36:41 +0000 (01:36 +0000)]
Merge "Make RawAddress into a class (1/3)"
am:
4a1fc85744
Change-Id: I61d249aa17044cd55b6834bc9563f648362621b6
Jakub Pawlowski [Fri, 7 Jul 2017 01:35:36 +0000 (01:35 +0000)]
Merge "Make RawAddress into a class (1/3)"
am:
4a1fc85744
Change-Id: I05b23ab3aff4d61dd8b04a3f011e832305203ce5
Treehugger Robot [Fri, 7 Jul 2017 01:29:30 +0000 (01:29 +0000)]
Merge "Make RawAddress into a class (1/3)"
Colin Cross [Thu, 6 Jul 2017 23:56:55 +0000 (16:56 -0700)]
Remove static library from required modules list
Requring an uninstallable module doesn't make sense.
Bug:
63400769
Test: builds
Change-Id: Idf452d8ee09c302d230c7a05b04d97f4bdfca98b
Android Build Merger (Role) [Thu, 6 Jul 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master
Myles Watson [Thu, 6 Jul 2017 22:56:19 +0000 (22:56 +0000)]
Remove unused BDADDR definitions
am:
525e743277
Change-Id: I211d82d42a53fe9bb2a6b930c7d99d5187b4f850