OSDN Git Service
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
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
Treehugger Robot [Wed, 26 Jul 2017 17:50:46 +0000 (17:50 +0000)]
Merge "Remove unwanted space characters from dialing number"
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
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
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
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
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
jruthe [Wed, 19 Jul 2017 22:12:45 +0000 (22:12 +0000)]
Merge "test_vendor: Fragment tests" am:
7453a5d341
am:
b8b17af6b8
Change-Id: Ia5e227f0cda1d072ece75c72a81ede7a379b7ec7
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:47:14 +0000 (21:47 +0000)]
test_vendor: Move include to .cc file am:
8769e8e923 am:
8b95e6e958
am:
2e703ac4ad
Change-Id: I904149ec223350722c8a3af7f261d309f9ffd34f
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
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
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
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
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
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:05:52 +0000 (00:05 +0000)]
Do not delete pairing on HCI connection timeout am:
f54d7e2719 am:
4cd563fbfb
am:
ea2a3f34cf
Change-Id: I4b227271d2080154c8dd11ae221754030d69ec42
Andre Eisenbach [Wed, 19 Jul 2017 00:03:51 +0000 (00:03 +0000)]
Do not delete pairing on HCI connection timeout am:
f54d7e2719
am:
4cd563fbfb
Change-Id: I0a019bc45665eeb340b2b8496913881e7b25d594
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
Andre Eisenbach [Tue, 18 Jul 2017 22:13:55 +0000 (15:13 -0700)]
Do not delete pairing on HCI connection timeout
Change-Id: I67121f3f6d34cd82e243af11ecd735684c4ca67d
(cherry picked from commit
f54d7e2719e36016f8dfa70757ae750909765776)
Fixes:
63796670
Test: manual
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
Android Build Merger (Role) [Tue, 18 Jul 2017 19:33:41 +0000 (19:33 +0000)]
Merge "Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5 am:
f4e2ea3bc2" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 18 Jul 2017 19:33:40 +0000 (19:33 +0000)]
Merge "Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5 am:
2ebd8f5769" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Tue, 18 Jul 2017 19:33:33 +0000 (19:33 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5
am:
f4e2ea3bc2
Change-Id: Iaf85cf19dfb8ebe761dd6e9d20765b3791858ed4
Pavlin Radoslavov [Tue, 18 Jul 2017 19:33:33 +0000 (19:33 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5
am:
2ebd8f5769
Change-Id: I29e3b58fc655b9ecb956bb4ec013eea9f31f6f97
Android Build Merger (Role) [Tue, 18 Jul 2017 19:33:28 +0000 (19:33 +0000)]
Merge "Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours am:
a7020eafc3 -s ours am:
af917e81bd -s ours" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Tue, 18 Jul 2017 19:33:18 +0000 (19:33 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours am:
a7020eafc3 -s ours
am:
af917e81bd -s ours
Change-Id: Ifadf30fc86702322d8ab003ea7e6cd3e040cc4fe
Pavlin Radoslavov [Tue, 18 Jul 2017 19:33:18 +0000 (19:33 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours am:
a7020eafc3 -s ours
am:
111b798be8 -s ours
Change-Id: If0a0c049f66f754f35fb0ae115ee4b0b7991fc0e
Pavlin Radoslavov [Tue, 18 Jul 2017 19:31:21 +0000 (19:31 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436 am:
d647097c74 am:
0a9673bceb am:
88f2ae07f4 am:
384e1dff72 -s ours am:
cc56e94905
am:
23195b1411
Change-Id: I27e1a3fa5db1232fd3ac199f96e7320afd5f5a31
Pavlin Radoslavov [Tue, 18 Jul 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69
am:
1c780fabd5
Change-Id: Ic8e89a3c82a113e796b7097bfcf019d341bbcff2
Pavlin Radoslavov [Tue, 18 Jul 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69
am:
1c780fabd5
Change-Id: Id09d66ad7aed3b9d88c8ed2426a190cb01e4e440
Pavlin Radoslavov [Tue, 18 Jul 2017 19:30:51 +0000 (19:30 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours
am:
a7020eafc3 -s ours
Change-Id: Ic4356a48ce3657abab7f3e46f5fafefe4f6dd908
Pavlin Radoslavov [Tue, 18 Jul 2017 19:30:50 +0000 (19:30 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours
am:
a7020eafc3 -s ours
Change-Id: Ifd89fb852bcaa3fc4028d2cc9bedea73e8018e73
Pavlin Radoslavov [Tue, 18 Jul 2017 19:29:54 +0000 (19:29 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436 am:
d647097c74 am:
0a9673bceb am:
88f2ae07f4 am:
384e1dff72 -s ours am:
cc56e94905
am:
bdf4687dc9
Change-Id: If9d70eaf54a1c692d9d2b502bdf6bd844bc5860f
Pavlin Radoslavov [Tue, 18 Jul 2017 19:29:39 +0000 (19:29 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
f8fc7f7d11 am:
2b53cd05f2 am:
28d58cb2c8 am:
9fa3d4f2c7 am:
92744bc2ce -s ours am:
27835e4e3e -s ours
am:
0aa2d9bbb9 -s ours
Change-Id: I6250c41d2e117cd5325ac96a1d770fa12422bf84
Pavlin Radoslavov [Tue, 18 Jul 2017 19:29:14 +0000 (19:29 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e
am:
471e964d69
Change-Id: I2285382ec2b4f7629fca84740933bb85b22fbfab
Pavlin Radoslavov [Tue, 18 Jul 2017 19:28:48 +0000 (19:28 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours
am:
515c909b33 -s ours
Change-Id: Ifffcbca70228a8bdac4bb00991742ced3a0c8e35
Pavlin Radoslavov [Tue, 18 Jul 2017 19:28:45 +0000 (19:28 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436 am:
d647097c74 am:
0a9673bceb am:
88f2ae07f4 am:
384e1dff72 -s ours
am:
cc56e94905
Change-Id: Iff7e1c0262caeb0217d67bd8f66e9baffabe6735
OSDN Git Service
