OSDN Git Service
Tyler Freeman [Tue, 1 Aug 2017 01:59:48 +0000 (01:59 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am:
fead72d124 -s ours am:
672ca0faf5 -s ours am:
0e379aaef1 -s ours
am:
0b9aac4eb5 -s ours
Change-Id: I1d5adc561db542384cb298e4343ab0b8a6a570ba
Tyler Freeman [Tue, 1 Aug 2017 01:53:47 +0000 (01:53 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am:
fead72d124 -s ours am:
672ca0faf5 -s ours am:
0e379aaef1 -s ours
am:
2008a94da6 -s ours
Change-Id: I9e6ac30fa7b713d80dee19a469adc1565c7f6880
Tyler Freeman [Tue, 1 Aug 2017 01:48:21 +0000 (01:48 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am:
fead72d124 -s ours am:
672ca0faf5 -s ours
am:
0e379aaef1 -s ours
Change-Id: I1fdf1d2c32c4ef79d7e56d2a3b34f8ecc6687bfb
Tyler Freeman [Tue, 1 Aug 2017 01:40:07 +0000 (01:40 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am:
fead72d124 -s ours am:
672ca0faf5 -s ours
am:
0e379aaef1 -s ours
Change-Id: I7cf536bdf1ab3c56ca5e1357749ef1b939dd703a
Tyler Freeman [Tue, 1 Aug 2017 01:33:50 +0000 (01:33 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am:
fead72d124 -s ours
am:
672ca0faf5 -s ours
Change-Id: Icf9b2a90b0adb3d9645bd6839ed9c244ba8c8c26
Tyler Freeman [Tue, 1 Aug 2017 01:24:13 +0000 (01:24 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3)
am:
fead72d124 -s ours
Change-Id: I96daa5c94b8ac75e2e7faf00911274ba72dff51b
Tyler Freeman [Fri, 28 Jul 2017 01:21:18 +0000 (18:21 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
(cherry picked from commit
7dc0525365025e17e289869288b1b7d5146306cc)
Merged-In: I7b1c526ee227897c003ac921078f317f96b92604
Change-Id: I9810484a136c69d487a4b415c9265913db6c5cce
Pavlin Radoslavov [Mon, 31 Jul 2017 18:14:52 +0000 (18:14 +0000)]
Fix the MAC address for INTEROP_2MBPS_LINK_ONLY entry am:
b60955f9c7 am:
7093baab90
am:
c824624aa6
Change-Id: Ic2ec5a88b31e4f1ca5acb5e0b815d75ce1ee0aef
Pavlin Radoslavov [Mon, 31 Jul 2017 18:11:22 +0000 (18:11 +0000)]
Fix the MAC address for INTEROP_2MBPS_LINK_ONLY entry am:
b60955f9c7
am:
7093baab90
Change-Id: I0e90bc82991f31c520be480c3f14a61901fa2827
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 18:08:20 +0000 (18:08 +0000)]
Fix the MAC address for INTEROP_2MBPS_LINK_ONLY entry
am:
3507060c58
Change-Id: I36bb63bd24c595b68976d89da8164b9ac7c1a96c
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
(cherry picked from commit
b60955f9c72d8481a1a2d92d46d59e2fd31139c9)
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 21:53:48 +0000 (21:53 +0000)]
Add interoperability mechanism to restrict the AVDTP MTU for AAC codec
am:
7cff5f55bf
Change-Id: Ifea61a89133cc420d255a675d4f80e39df05185d
Pavlin Radoslavov [Fri, 28 Jul 2017 19:38:40 +0000 (19:38 +0000)]
Add interoperability mechanism to restrict the AVDTP MTU for AAC codec am:
b866da0bc1 am:
ec7b336583
am:
a84c2057b6
Change-Id: I03015c3754f317f14fac387393f47974f0b189ce
Pavlin Radoslavov [Fri, 28 Jul 2017 19:34:08 +0000 (19:34 +0000)]
Add interoperability mechanism to restrict the AVDTP MTU for AAC codec am:
b866da0bc1
am:
ec7b336583
Change-Id: Id94f4643bec9e052d51e54950bab9ef8b062a13a
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
(cherry picked from commit
b866da0bc1254103146912077bcb49128963dee7)
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:38:36 +0000 (02:38 +0000)]
Merge "Retry authentication in key-missing or pairing collision use case" into oc-dr1-dev
am:
0b95c58b0d
Change-Id: I5639a930b06858f5f780c8842649eabc6163b820
Matadeen Mishra [Thu, 27 Jul 2017 02:36:05 +0000 (02:36 +0000)]
Retry authentication in key-missing or pairing collision use case am:
a95a6a3608 am:
27457a8b85
am:
06a13195af
Change-Id: Ie5dbfb47dc879508c1799619735972ffb457cf74
Matadeen Mishra [Thu, 27 Jul 2017 02:34:06 +0000 (02:34 +0000)]
Retry authentication in key-missing or pairing collision use case am:
a95a6a3608
am:
27457a8b85
Change-Id: I343dbedf4a3aefe61c4e37fe8d0e2f0f26b02a49
TreeHugger Robot [Thu, 27 Jul 2017 02:30:27 +0000 (02:30 +0000)]
Merge "Retry authentication in key-missing or pairing collision use case" into oc-dr1-dev
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
Stanley Tng [Thu, 27 Jul 2017 02:14:34 +0000 (02:14 +0000)]
Merge "Remove unwanted space characters from dialing number" into oc-dr1-dev
am:
332808df52
Change-Id: I2cea8eab02198b9b141e54a585032dc547320818
TreeHugger Robot [Thu, 27 Jul 2017 02:07:35 +0000 (02:07 +0000)]
Merge "Remove unwanted space characters from dialing number" into oc-dr1-dev
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)
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)
Pavlin Radoslavov [Wed, 26 Jul 2017 21:37:26 +0000 (21:37 +0000)]
Use a mutex to protect the consistency of the tBTA_PM_TIMER state
am:
dbe6451648
Change-Id: If64141be51bf876038283daca40ceadb274d4780
Eric Laurent [Wed, 26 Jul 2017 20:33:53 +0000 (20:33 +0000)]
Merge "Revert "bt: Update libchrome APIS to r456626."" am:
6241dd5522 am:
afc7f05f72
am:
1e541be8c5
Change-Id: Id2c114e6685eafd196fc84d9cbb7e1d43cb51efa
Eric Laurent [Wed, 26 Jul 2017 20:29:11 +0000 (20:29 +0000)]
Merge "Revert "bt: Update libchrome APIS to r456626."" am:
6241dd5522
am:
afc7f05f72
Change-Id: I2f8ceb0afa199d5faee032b4b6f03206589d5421
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
Pavlin Radoslavov [Wed, 26 Jul 2017 20:04:49 +0000 (20:04 +0000)]
Merge "Use a mutex to protect the consistency of the tBTA_PM_TIMER state" am:
02ce3f8f52 am:
6baf3931ae
am:
6843fcc1b8
Change-Id: I9421702bbf69be463345377fc54a8bc85e3a0562
Pavlin Radoslavov [Wed, 26 Jul 2017 20:02:19 +0000 (20:02 +0000)]
Merge "Use a mutex to protect the consistency of the tBTA_PM_TIMER state" am:
02ce3f8f52
am:
6baf3931ae
Change-Id: I2d2f4cb5b997af3dcf18eb6d1792163ff0aa90d5
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:43:50 +0000 (18:43 +0000)]
Merge "HFP Client connect Audio" am:
d568679105 am:
d9401dfa06
am:
54dfa9bdc0
Change-Id: Iaad34e25ebfb7dacc163c19c2749bcaa24874475
Joseph Pirozzo [Wed, 26 Jul 2017 18:39:19 +0000 (18:39 +0000)]
Merge "HFP Client connect Audio" am:
d568679105
am:
d9401dfa06
Change-Id: I985b2d6e8d09e35bde57eb75f54024f8e51d438c
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:20:57 +0000 (18:20 +0000)]
Merge "Remove unwanted space characters from dialing number" am:
ac3faef9da am:
86470eebc8
am:
56f2268904
Change-Id: I469fb5bafc2e74afa4d125efc79c95e4f1c6c99b
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
(cherry picked from commit
f470def4e91301b7b161b88b0428476ecce4f324)
Stanley Tng [Wed, 26 Jul 2017 18:11:58 +0000 (18:11 +0000)]
Merge "Remove unwanted space characters from dialing number" am:
ac3faef9da
am:
86470eebc8
Change-Id: I46b2bc514c28a59e59e2ff2542c99a18bd8e71b5
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
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
(cherry picked from commit
54a1461a29a8c71dd010d418ec1b23012bf32805)
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 02:01:23 +0000 (02:01 +0000)]
bt: Update libchrome APIS to r456626. am:
014890b748 am:
c05cd556df
am:
2096bedc0c
Change-Id: I9868b517e218c0a3aa68fc4df6e6b8580b4a5e7a
Jay Civelli [Wed, 26 Jul 2017 01:57:26 +0000 (01:57 +0000)]
bt: Update libchrome APIS to r456626. am:
014890b748
am:
c05cd556df
Change-Id: I92cda49c91c18bf0ca080d3ea9b27cff4fbb7240
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
Pavlin Radoslavov [Mon, 24 Jul 2017 23:22:00 +0000 (23:22 +0000)]
Merge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"" into oc-dr1-dev
am:
b53fcadb1b
Change-Id: If695567b6e9d619c108bf89d52647b500332fe4a
Pavlin Radoslavov [Mon, 24 Jul 2017 23:21:46 +0000 (23:21 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism for 2Mbps-only links for audio""" into oc-dr1-dev
am:
5074c2f9bf -s ours
Change-Id: I399e3a6c04c0ba6ac1ccba7055208526be173598
Andre Eisenbach [Mon, 24 Jul 2017 23:21:22 +0000 (23:21 +0000)]
Reduce error conditions which cause link key deletion on auth complete
am:
f4835d65ed -s ours
Change-Id: I4f03fc57fa32ef73dfcf5fce04d8a88af87a4e65
Myles Watson [Sat, 22 Jul 2017 03:51:17 +0000 (03:51 +0000)]
Merge "test_vendor: Add base implementation" am:
f246f94a5b am:
15278a5fb0
am:
73628cf8f7
Change-Id: Icaa95a4ec3a0bed9de4c43cfb6d5428e5cfa587a
Myles Watson [Sat, 22 Jul 2017 03:49:13 +0000 (03:49 +0000)]
Merge "test_vendor: Add base implementation" am:
f246f94a5b
am:
15278a5fb0
Change-Id: I83bd78131cc69969d1b1f3c06af9d57a1f284d73
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"
TreeHugger Robot [Sat, 22 Jul 2017 01:35:23 +0000 (01:35 +0000)]
Merge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 01:30:28 +0000 (01:30 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism for 2Mbps-only links for audio""" into oc-dr1-dev
Colin Cross [Fri, 21 Jul 2017 23:10:42 +0000 (23:10 +0000)]
Merge "Remove static library from required modules list" am:
01e400f210 am:
7b4994677f
am:
f40d85a731
Change-Id: I1ac29cda716498d4bc11538ca7eba64d173033f2
Colin Cross [Fri, 21 Jul 2017 23:08:05 +0000 (23:08 +0000)]
Merge "Remove static library from required modules list" am:
01e400f210
am:
7b4994677f
Change-Id: I4a41dc8508fbeec15ba7f3748e801b7bc7c142e2
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"
Pavlin Radoslavov [Fri, 21 Jul 2017 22:06:29 +0000 (22:06 +0000)]
DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism for 2Mbps-only links for audio""
This reverts commit
ff1c56c3675079b3905739abffc3a6035529a248.
The original issue in oc-mr1-dev has been resolved by:
https://googleplex-android-review.git.corp.google.com/#/c/
2576565/
Change-Id: I8bac8dca7939bac1865fe820e3c7b8252ce99478
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159
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
(cherry picked from commit
51fb9c0e0cfbda559bf6377c183928ae48a24629)
jruthe [Fri, 21 Jul 2017 20:28:10 +0000 (20:28 +0000)]
Merge "test_vendor: Change assemble function parameters" am:
2f75d93cf3 am:
2c8e56fafc
am:
f09547053b
Change-Id: Icb019898c9acaaaddc1e256bf222d85b7d136edf
johnshamoon [Fri, 21 Jul 2017 20:27:51 +0000 (20:27 +0000)]
Fix build by adding bt_types to bluetooth.h (1/2) am:
66676ad1e6 am:
d1c8ad0ee2
am:
75e81140bc
Change-Id: I1681d3ac3756b0ae7b37f1854e0d77f26f1c466b
jruthe [Fri, 21 Jul 2017 20:25:58 +0000 (20:25 +0000)]
Merge "test_vendor: Change assemble function parameters" am:
2f75d93cf3
am:
2c8e56fafc
Change-Id: Idc444bc7cc577ea1792225c9130afd4a1927123a
johnshamoon [Fri, 21 Jul 2017 20:25:44 +0000 (20:25 +0000)]
Fix build by adding bt_types to bluetooth.h (1/2) am:
66676ad1e6
am:
d1c8ad0ee2
Change-Id: I0fe98b5e669c17b9f04c48d50c8378145b037943
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
Andrew Scull [Fri, 21 Jul 2017 12:31:14 +0000 (12:31 +0000)]
Revert "Fix the interoperability mechanism for 2Mbps-only links for audio"
am:
ff1c56c367 -s ours
Change-Id: Idd3eb922fbd526c8025bfcf05c07d9f12472ef5d
Andrew Scull [Fri, 21 Jul 2017 09:57:09 +0000 (09:57 +0000)]
Revert "Fix the interoperability mechanism for 2Mbps-only links for audio"
This reverts commit
039f9a8f09ab25b4b16acfd9aca3733108d02b28.
Reason for revert: Failing build in oc-mr1-dev
Change-Id: I186c116d4b26cd4b92938066309a898b82ef90bc
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159
Pavlin Radoslavov [Fri, 21 Jul 2017 07:35:26 +0000 (07:35 +0000)]
Fix the interoperability mechanism for 2Mbps-only links for audio
am:
039f9a8f09 -s ours
Change-Id: I159defaa1b059c5601360bf88b8a16a92858b1f1
Pavlin Radoslavov [Fri, 21 Jul 2017 03:19:10 +0000 (03:19 +0000)]
Merge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"" am:
0382042e18 am:
a1e69e28c3
am:
20d8d22ff6
Change-Id: Id3c40057bf93af331fe53f222e63625fe1144137
Pavlin Radoslavov [Fri, 21 Jul 2017 03:16:40 +0000 (03:16 +0000)]
Merge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"" am:
0382042e18
am:
a1e69e28c3
Change-Id: I55847b4bbe0b728e506d466eb74650ceb07fea11
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:46:09 +0000 (02:46 +0000)]
Merge "Reduce error conditions which cause link key deletion on auth complete" am:
7c17ea31ff am:
89750502f5
am:
82bd9a7718
Change-Id: Ibcdc6819c3b64c27f77864512a051b979132deab
Andre Eisenbach [Fri, 21 Jul 2017 02:43:38 +0000 (02:43 +0000)]
Merge "Reduce error conditions which cause link key deletion on auth complete" am:
7c17ea31ff
am:
89750502f5
Change-Id: I1e1a48e1bacf1e01a3fcdfdf2789ec34caa728c3
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:27:37 +0000 (02:27 +0000)]
Fix the interoperability mechanism for 2Mbps-only links for audio am:
0dec1807c6 am:
853088d3d7
am:
250194d1b1
Change-Id: I12813c39b74fe2385ad79681638225780e82d88c
Pavlin Radoslavov [Fri, 21 Jul 2017 02:25:06 +0000 (02:25 +0000)]
Fix the interoperability mechanism for 2Mbps-only links for audio am:
0dec1807c6
am:
853088d3d7
Change-Id: Ie41ee68639e78fc4d41a8ef87037a158fac463b9
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
(cherry picked from commit
a97b0381c8626320151c246cfd9a71dedcf635ff)
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
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159
(cherry picked from commit
0dec1807c6770a2e5f8b673588922046ed272255)
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:21:27 +0000 (16:21 +0000)]
Add additional LE transport lookup in BTM_ReadRSSI for DUMO device am:
5154ea8a5c am:
fcb0fbc685
am:
16260fbc5d
Change-Id: I65d1a8407d9f4469dce8289d91dea03f957e5bf1