OSDN Git Service
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"
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: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: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: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
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: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
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: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
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: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
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
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: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: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:44 +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: I2f55bc51d3e195e134d2d7460bfa5854e4387775
Pavlin Radoslavov [Tue, 18 Jul 2017 19:26:05 +0000 (19:26 +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
Change-Id: I460a7805ba5d6ce28751bfba59245026ab09d49b
Pavlin Radoslavov [Tue, 18 Jul 2017 19:25:48 +0000 (19:25 +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
Change-Id: Idb3ed55f34818ce3af08e56787ac51dff49d6d92
Pavlin Radoslavov [Tue, 18 Jul 2017 19:25:45 +0000 (19:25 +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
Change-Id: I041e907145d3f299b59c3fcbd8ae25c86176622d
Pavlin Radoslavov [Tue, 18 Jul 2017 19:23:04 +0000 (19:23 +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
Change-Id: I825dc2f50a83d94b54baf1f430e71c63f6bfcb3e
Pavlin Radoslavov [Tue, 18 Jul 2017 19:22:48 +0000 (19:22 +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
Change-Id: Id43622ce2ff6520e12bc80d4d034c59d3ab909ca
Pavlin Radoslavov [Tue, 18 Jul 2017 19:20:44 +0000 (19:20 +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
Change-Id: Idea1e755dd079731745a899aa7668a0f7179cb9e
Pavlin Radoslavov [Tue, 18 Jul 2017 19:20:18 +0000 (19:20 +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
Change-Id: I904f7c891013d2e397a522d11039f2056d75fc4e
Pavlin Radoslavov [Tue, 18 Jul 2017 19:20:17 +0000 (19:20 +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
Change-Id: If35fa07c33914a1df863f0c72b0d3061ae463678
Pavlin Radoslavov [Tue, 18 Jul 2017 19:12:54 +0000 (19:12 +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
Change-Id: Id14d11e553b6ba2f3fa688302415c79a537940a2
Pavlin Radoslavov [Tue, 18 Jul 2017 19:12:36 +0000 (19:12 +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
Change-Id: I2e18a2b625023a318da67b7a5140fac5fb9ee590
Pavlin Radoslavov [Tue, 18 Jul 2017 19:12:36 +0000 (19:12 +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
Change-Id: Ib74d462308ed0e99f75aaca7e9344de3b07ba5a8
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:52 +0000 (19:05 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436 am:
d647097c74 am:
0a9673bceb
am:
88f2ae07f4
Change-Id: I05f7864e4eb435e5d0cc7f5275fd4f34deb724b8
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:51 +0000 (19:05 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee
am:
97922c7401
Change-Id: Id1569df9156b8de893dcb5c28997ec4a924eb82e
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:38 +0000 (19:05 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189
am:
ba12732aad -s ours
Change-Id: Id1a43cefdc006f9f6d24b35b21502c8453bdd673
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:37 +0000 (19:05 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
f8fc7f7d11 am:
2b53cd05f2 am:
28d58cb2c8
am:
9fa3d4f2c7
Change-Id: Ia4b3bc004eb035bc219c168588fd548f57d09ae1
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:20 +0000 (19:01 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436 am:
d647097c74
am:
0a9673bceb
Change-Id: Ie95b83df4e6207985196ab5fb9b27bb8c90c06ac
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:19 +0000 (19:01 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a
am:
0cea290eee
Change-Id: I24ad37b139ec7af93fde160b16da095d77bd4729
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:05 +0000 (19:01 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1
am:
7eda996189
Change-Id: I3587c48c072b808e8a84a63d1e6f63ea39f158b5
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:05 +0000 (19:01 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
f8fc7f7d11 am:
2b53cd05f2
am:
28d58cb2c8
Change-Id: I4bcb033225cf04a45b8338d2298e761d58e2cbb2
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:47 +0000 (18:55 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436
am:
d647097c74
Change-Id: I60c65481543f6b6ec698419d08b94877717783ff
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:45 +0000 (18:55 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e
am:
fd94c15a5a
Change-Id: I635b78d48c94608adb9a1ef784bf5884f64610a3
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:33 +0000 (18:55 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c
am:
ffa87779a1
Change-Id: I4e93ec83fac0bfa764f7b78bf33d0ba088e5bc3a
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:33 +0000 (18:55 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
f8fc7f7d11
am:
2b53cd05f2
Change-Id: I7de55b1c83bee83bed75b25c3ab6339a6341402b
Pavlin Radoslavov [Tue, 18 Jul 2017 18:51:35 +0000 (18:51 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into oc-dev
am:
25fb3d4059
Change-Id: I82e4fa5f58b3d2d336abc35784190c3025aaad15
Pavlin Radoslavov [Tue, 18 Jul 2017 18:51:27 +0000 (18:51 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev
am:
fdcad53f8e
Change-Id: I3ae12cba736d90e70bb52888063304337550081c
Pavlin Radoslavov [Tue, 18 Jul 2017 18:51:04 +0000 (18:51 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
am:
a654681c55
Change-Id: I5c95895c8b38146adedb88f57c4a095a90aeb0c4
Pavlin Radoslavov [Tue, 18 Jul 2017 18:51:03 +0000 (18:51 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
am:
8f18afd26c
Change-Id: I23886b18719d28ef3ae397ec6444b9e2692885e8
Pavlin Radoslavov [Tue, 18 Jul 2017 18:50:50 +0000 (18:50 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev
am:
c3619e1436
Change-Id: Iab6a952226fae34db9f34192312839c03cb800d7
Pavlin Radoslavov [Tue, 18 Jul 2017 18:50:36 +0000 (18:50 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
am:
f8fc7f7d11
Change-Id: Ib41c89b0070c24eb22576bc6536a5b63d19406a7
TreeHugger Robot [Tue, 18 Jul 2017 18:46:45 +0000 (18:46 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev
TreeHugger Robot [Tue, 18 Jul 2017 18:45:57 +0000 (18:45 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev
TreeHugger Robot [Tue, 18 Jul 2017 18:45:12 +0000 (18:45 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into oc-dev
Pavlin Radoslavov [Tue, 18 Jul 2017 01:12:10 +0000 (18:12 -0700)]
Add missing extension length check while parsing BNEP control packets
Bug:
63146237
Test: External script
Change-Id: I4e519cec1c7dffb8bd42add00bd891e0969a3d9f
(cherry picked from commit
9ab89b7dbe5735b796799f65144efa48595d0230)
(cherry picked from commit
dc7700a43189d2a8607b69ae19a6d646f11ddf51)
(cherry picked from commit
c7874f25a0557ca4413d8db80bab8da842fc389a)
(cherry picked from commit
187bd8aec0aae63c6328981041e5ec7764ece6a9)
(cherry picked from commit
01f46e0aff705dab350cda7f648fb94976ea3988)
Pavlin Radoslavov [Tue, 18 Jul 2017 01:12:10 +0000 (18:12 -0700)]
Add missing extension length check while parsing BNEP control packets
Bug:
63146237
Test: External script
Change-Id: I4e519cec1c7dffb8bd42add00bd891e0969a3d9f
(cherry picked from commit
9ab89b7dbe5735b796799f65144efa48595d0230)
(cherry picked from commit
dc7700a43189d2a8607b69ae19a6d646f11ddf51)
(cherry picked from commit
c7874f25a0557ca4413d8db80bab8da842fc389a)
(cherry picked from commit
187bd8aec0aae63c6328981041e5ec7764ece6a9)
Pavlin Radoslavov [Mon, 17 Jul 2017 23:03:21 +0000 (16:03 -0700)]
Add missing extension length check while parsing BNEP control packets
Bug:
63146237
Test: External script
Change-Id: I4e519cec1c7dffb8bd42add00bd891e0969a3d9f
(cherry picked from commit
9ab89b7dbe5735b796799f65144efa48595d0230)
Pavlin Radoslavov [Tue, 18 Jul 2017 00:21:16 +0000 (17:21 -0700)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
Bug:
63146105
Test: External script
Change-Id: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
Merged-In: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
(cherry picked from commit
4982eb5df30cbcbee5c8b8807be95fdc6dfa63c5)
(cherry picked from commit
a654681c5558904a8abfa1bbab8eafb651c13231)
(cherry picked from commit
64a12d3b6e71d9161837f28ce18c34d924c2bafc)
(cherry picked from commit
8f18afd26c02ae3d46bf14d6e36017965dee0394)
Pavlin Radoslavov [Tue, 18 Jul 2017 00:21:16 +0000 (17:21 -0700)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
Bug:
63146105
Test: External script
Change-Id: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
Merged-In: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
(cherry picked from commit
4982eb5df30cbcbee5c8b8807be95fdc6dfa63c5)
(cherry picked from commit
a654681c5558904a8abfa1bbab8eafb651c13231)
(cherry picked from commit
64a12d3b6e71d9161837f28ce18c34d924c2bafc)
Pavlin Radoslavov [Mon, 17 Jul 2017 22:41:12 +0000 (15:41 -0700)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
Bug:
63146105
Test: External script
Change-Id: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
Merged-In: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca
(cherry picked from commit
4982eb5df30cbcbee5c8b8807be95fdc6dfa63c5)
jruthe [Mon, 17 Jul 2017 23:29:49 +0000 (23:29 +0000)]
test_vendor: Add LOG_DEBUG to L2cap::assemble am:
8d604d6ab0
am:
8fb366ebdc
Change-Id: Ifc9cacb3da6cf8f5a45c5e7ead50e01f23d5b774
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:49:12 +0000 (17:49 +0000)]
test_vendor: Move SDU checks to L2capSdu am:
7d267611a4
am:
19e6b8bb34
Change-Id: I6518b928bcda7e20a26036b7cc96200140e5cabe
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:47:18 +0000 (16:47 +0000)]
Merge "Add LEN_UUID_128 type check while build UUID seq" am:
48942c700e
am:
0b1297d5ed
Change-Id: I365be81c02a69a4b84b8329a1280f753bc2194ff
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:53:33 +0000 (07:53 +0000)]
Linux build fix am:
d3988fd73c
am:
a717c2324a
Change-Id: I1ed33d1dfcc7115bfb943dcfbc83e41b1bcdcd74
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:09:48 +0000 (04:09 +0000)]
test_vendor: Add L2cap and L2capSdu assemble tests am:
7552c35aec
am:
89e5bba5a4
Change-Id: Ifa234f1cce0c2a56c89c2d0ea763cc9e9fb267b7
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:35:34 +0000 (00:35 +0000)]
Merge "Advertise data parser - allow zero padding at end of packet" am:
c45e5d2dca
am:
6c7c052685
Change-Id: I348cb08f9ab8bf1bd5935e5a6e8820be45f2068d
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:58:57 +0000 (22:58 +0000)]
test_vendor: L2cap Assemble additional error check am:
16995c3a50
am:
fe1a007688
Change-Id: I5cd8b48f3bb0899ad6368a2679414388733f81a7
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