OSDN Git Service

android-x86/system-bt.git
6 years agoAdd interoperability mechanism to restrict the AVDTP MTU for AAC codec am: b866da0bc1...
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

6 years agoAdd interoperability mechanism to restrict the AVDTP MTU for AAC codec am: b866da0bc1
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

6 years agoAdd interoperability mechanism to restrict the AVDTP MTU for AAC codec
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

7 years agoAdd interoperability mechanism to restrict the AVDTP MTU for AAC codec
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

7 years agoMerge "Retry authentication in key-missing or pairing collision use case" into oc...
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

7 years agoRetry authentication in key-missing or pairing collision use case am: a95a6a3608...
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

7 years agoRetry authentication in key-missing or pairing collision use case am: a95a6a3608
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

7 years agoMerge "Retry authentication in key-missing or pairing collision use case" into oc...
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

7 years agoRetry authentication in key-missing or pairing collision use case
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

7 years agoMerge "Remove unwanted space characters from dialing number" into oc-dr1-dev
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

7 years agoMerge "Remove unwanted space characters from dialing number" into oc-dr1-dev
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

7 years agoRetry authentication in key-missing or pairing collision use case
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)

7 years agoRetry authentication in key-missing or pairing collision use case
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)

7 years agoUse a mutex to protect the consistency of the tBTA_PM_TIMER state
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

7 years agoMerge "Revert "bt: Update libchrome APIS to r456626."" am: 6241dd5522 am: afc7f05f72
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

7 years agoMerge "Revert "bt: Update libchrome APIS to r456626."" am: 6241dd5522
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

7 years agoMerge "Revert "bt: Update libchrome APIS to r456626.""
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

7 years agoMerge "Use a mutex to protect the consistency of the tBTA_PM_TIMER state" am: 02ce3f8...
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

7 years agoMerge "Use a mutex to protect the consistency of the tBTA_PM_TIMER state" am: 02ce3f8f52
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

7 years agoMerge "Revert "bt: Update libchrome APIS to r456626.""
Eric Laurent [Wed, 26 Jul 2017 20:02:18 +0000 (20:02 +0000)]
Merge "Revert "bt: Update libchrome APIS to r456626.""

7 years agoMerge "Use a mutex to protect the consistency of the tBTA_PM_TIMER state"
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

7 years agoMerge "Use a mutex to protect the consistency of the tBTA_PM_TIMER state"
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"

7 years agoMerge "HFP Client connect Audio" am: d568679105 am: d9401dfa06
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

7 years agoMerge "HFP Client connect Audio" am: d568679105
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

7 years agoMerge "HFP Client connect Audio"
Joseph Pirozzo [Wed, 26 Jul 2017 18:35:19 +0000 (18:35 +0000)]
Merge "HFP Client connect Audio"
am: d568679105

Change-Id: Ie8b2a8b3b0d54d10fb99017d6f34649004033a5c

7 years agoMerge "HFP Client connect Audio"
Treehugger Robot [Wed, 26 Jul 2017 18:30:08 +0000 (18:30 +0000)]
Merge "HFP Client connect Audio"

7 years agoMerge "Remove unwanted space characters from dialing number" am: ac3faef9da am: 86470...
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

7 years agoUse a mutex to protect the consistency of the tBTA_PM_TIMER state
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)

7 years agoMerge "Remove unwanted space characters from dialing number" am: ac3faef9da
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

7 years agoMerge "Remove unwanted space characters from dialing number"
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

7 years agoRemove unwanted space characters from dialing number
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)

7 years agoMerge "Remove unwanted space characters from dialing number"
Treehugger Robot [Wed, 26 Jul 2017 17:50:46 +0000 (17:50 +0000)]
Merge "Remove unwanted space characters from dialing number"

7 years agoRevert "bt: Update libchrome APIS to r456626."
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

7 years agoUse a mutex to protect the consistency of the tBTA_PM_TIMER state
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

7 years agobt: Update libchrome APIS to r456626. am: 014890b748 am: c05cd556df
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

7 years agobt: Update libchrome APIS to r456626. am: 014890b748
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

7 years agobt: Update libchrome APIS to r456626.
Jay Civelli [Wed, 26 Jul 2017 01:53:56 +0000 (01:53 +0000)]
bt: Update libchrome APIS to r456626.
am: 014890b748

Change-Id: Iaba9b51fa55e72df01bcdb46c10dcf46d11a6856

7 years agoHFP Client connect Audio
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

7 years agoRemove unwanted space characters from dialing number
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

7 years agobt: Update libchrome APIS to r456626.
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

7 years agoMerge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU...
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

7 years agoMerge "DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism...
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

7 years agoReduce error conditions which cause link key deletion on auth complete
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

7 years agoMerge "test_vendor: Add base implementation" am: f246f94a5b am: 15278a5fb0
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

7 years agoMerge "test_vendor: Add base implementation" am: f246f94a5b
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

7 years agoMerge "test_vendor: Add base implementation"
Myles Watson [Sat, 22 Jul 2017 03:46:50 +0000 (03:46 +0000)]
Merge "test_vendor: Add base implementation"
am: f246f94a5b

Change-Id: I94550ef296e9d70739d16711c5f4601e6541df3a

7 years agoMerge "test_vendor: Add base implementation"
Treehugger Robot [Sat, 22 Jul 2017 03:42:59 +0000 (03:42 +0000)]
Merge "test_vendor: Add base implementation"

7 years agoMerge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU...
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

7 years agoMerge "DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism...
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

7 years agoMerge "Remove static library from required modules list" am: 01e400f210 am: 7b4994677f
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

7 years agoMerge "Remove static library from required modules list" am: 01e400f210
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

7 years agoMerge "Remove static library from required modules list"
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

7 years agoMerge "Remove static library from required modules list"
Treehugger Robot [Fri, 21 Jul 2017 22:57:44 +0000 (22:57 +0000)]
Merge "Remove static library from required modules list"

7 years agoDO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism for 2Mbps...
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

7 years agoReduce error conditions which cause link key deletion on auth complete
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)

7 years agoMerge "test_vendor: Change assemble function parameters" am: 2f75d93cf3 am: 2c8e56fafc
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

7 years agoFix build by adding bt_types to bluetooth.h (1/2) am: 66676ad1e6 am: d1c8ad0ee2
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

7 years agoMerge "test_vendor: Change assemble function parameters" am: 2f75d93cf3
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

7 years agoFix build by adding bt_types to bluetooth.h (1/2) am: 66676ad1e6
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

7 years agoMerge "test_vendor: Change assemble function parameters"
jruthe [Fri, 21 Jul 2017 20:23:00 +0000 (20:23 +0000)]
Merge "test_vendor: Change assemble function parameters"
am: 2f75d93cf3

Change-Id: I8d1d6e37aba524ca32ef9662404075015e28d8ab

7 years agoFix build by adding bt_types to bluetooth.h (1/2)
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

7 years agoMerge "test_vendor: Change assemble function parameters"
Treehugger Robot [Fri, 21 Jul 2017 20:18:14 +0000 (20:18 +0000)]
Merge "test_vendor: Change assemble function parameters"

7 years agotest_vendor: Add base implementation
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

7 years agotest_vendor: Change assemble function parameters
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

7 years agoFix build by adding bt_types to bluetooth.h (1/2)
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

7 years agoRevert "Fix the interoperability mechanism for 2Mbps-only links for audio"
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

7 years agoRevert "Fix the interoperability mechanism for 2Mbps-only links for audio"
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

7 years agoFix the interoperability mechanism for 2Mbps-only links for audio
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

7 years agoMerge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU...
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

7 years agoMerge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU...
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

7 years agoMerge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU...
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

7 years agoMerge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU...
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)""

7 years agoMerge "Reduce error conditions which cause link key deletion on auth complete" am...
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

7 years agoMerge "Reduce error conditions which cause link key deletion on auth complete" am...
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

7 years agoMerge "Reduce error conditions which cause link key deletion on auth complete"
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

7 years agoMerge "Reduce error conditions which cause link key deletion on auth complete"
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"

7 years agoFix the interoperability mechanism for 2Mbps-only links for audio am: 0dec1807c6...
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

7 years agoFix the interoperability mechanism for 2Mbps-only links for audio am: 0dec1807c6
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

7 years agoFix the interoperability mechanism for 2Mbps-only links for audio
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

7 years agoReduce error conditions which cause link key deletion on auth complete
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

7 years agoRevert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"
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)

7 years agoRevert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"
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

7 years agoFix the interoperability mechanism for 2Mbps-only links for audio
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)

7 years agoFix the interoperability mechanism for 2Mbps-only links for audio
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

7 years agoAdd additional LE transport lookup in BTM_ReadRSSI for DUMO device am: 5154ea8a5c...
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

7 years agoAdd additional LE transport lookup in BTM_ReadRSSI for DUMO device am: 5154ea8a5c
Jacky Cheung [Thu, 20 Jul 2017 16:17:55 +0000 (16:17 +0000)]
Add additional LE transport lookup in BTM_ReadRSSI for DUMO device am: 5154ea8a5c
am: fcb0fbc685

Change-Id: Ifa0d97de4dd1da37315e35cb4d7926a33f896102

7 years agoAdd additional LE transport lookup in BTM_ReadRSSI for DUMO device
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

7 years agoAdd additional LE transport lookup in BTM_ReadRSSI for DUMO device
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

7 years agoMerge "resolve merge conflicts of 985644c8c to oc-dr1-dev-plus-aosp" into oc-dr1...
TreeHugger Robot [Wed, 19 Jul 2017 22:19:44 +0000 (22:19 +0000)]
Merge "resolve merge conflicts of 985644c8c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp

7 years agoMerge "test_vendor: Fragment tests" am: 7453a5d341 am: b8b17af6b8
jruthe [Wed, 19 Jul 2017 22:15:47 +0000 (22:15 +0000)]
Merge "test_vendor: Fragment tests" am: 7453a5d341 am: b8b17af6b8
am: d0e79aecb5

Change-Id: I43c6ade0c6617c9eb97161733b57dd2a3e4069f8

7 years agoMerge "test_vendor: Fragment tests" am: 7453a5d341
jruthe [Wed, 19 Jul 2017 22:12:45 +0000 (22:12 +0000)]
Merge "test_vendor: Fragment tests" am: 7453a5d341
am: b8b17af6b8

Change-Id: Ia5e227f0cda1d072ece75c72a81ede7a379b7ec7

7 years agoMerge "test_vendor: Fragment tests"
jruthe [Wed, 19 Jul 2017 22:10:16 +0000 (22:10 +0000)]
Merge "test_vendor: Fragment tests"
am: 7453a5d341

Change-Id: If10528953ba17e74851d28c079e8ed321f869209

7 years agoMerge "test_vendor: Fragment tests"
Treehugger Robot [Wed, 19 Jul 2017 22:01:48 +0000 (22:01 +0000)]
Merge "test_vendor: Fragment tests"

7 years agotest_vendor: Move include to .cc file am: 8769e8e923 am: 8b95e6e958
Myles Watson [Wed, 19 Jul 2017 21:47:14 +0000 (21:47 +0000)]
test_vendor: Move include to .cc file am: 8769e8e923 am: 8b95e6e958
am: 2e703ac4ad

Change-Id: I904149ec223350722c8a3af7f261d309f9ffd34f

7 years agotest_vendor: Move include to .cc file am: 8769e8e923
Myles Watson [Wed, 19 Jul 2017 21:43:45 +0000 (21:43 +0000)]
test_vendor: Move include to .cc file am: 8769e8e923
am: 8b95e6e958

Change-Id: I7aab7a02f4f579a91d489dcbaf0491c85a8f5278

7 years agotest_vendor: Move include to .cc file
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

7 years agotest_vendor: Move include to .cc file
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

7 years agoresolve merge conflicts of 985644c8c to oc-dr1-dev-plus-aosp
Andre Eisenbach [Wed, 19 Jul 2017 18:58:40 +0000 (11:58 -0700)]
resolve merge conflicts of 985644c8c to oc-dr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I11ab2a019d1ab2c202eb47f373bf532deb6814d1

7 years agoMerge "test_vendor: Implement L2CAP packet fragmentation" am: 3dc90dd77e am: 967f9908d7
jruthe [Wed, 19 Jul 2017 00:33:32 +0000 (00:33 +0000)]
Merge "test_vendor: Implement L2CAP packet fragmentation" am: 3dc90dd77e am: 967f9908d7
am: 525753fab5

Change-Id: I31f564becafacd43b2e24dbcb22940e5597658a6

7 years agoMerge "test_vendor: Implement L2CAP packet fragmentation" am: 3dc90dd77e
jruthe [Wed, 19 Jul 2017 00:31:54 +0000 (00:31 +0000)]
Merge "test_vendor: Implement L2CAP packet fragmentation" am: 3dc90dd77e
am: 967f9908d7

Change-Id: If3c699aed92a4f331b663727238b6d0d0d68686d