OSDN Git Service
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: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: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: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: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: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: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: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: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: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: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 [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
jruthe [Tue, 11 Jul 2017 21:09:51 +0000 (14:09 -0700)]
test_vendor: L2cap Assemble additional error check
Assemble now properly checks the proposed length of a segmented SDU that
is given in the first packet of any segmented SDU in accordance with
Bluetooth Core Specification Version 4.2 Volume 3 Part A 3.3.2
Test: Passed in test/l2cap_test.cc
Change-Id: Idbbd1c014bac8928affab581118f73a7d9126824
jruthe [Fri, 14 Jul 2017 02:36:42 +0000 (02:36 +0000)]
test_vendor: Rename L2cap class to L2capPacket am:
d930fac3df
am:
57e758ef3f
Change-Id: Ic3bda32e813741dbb87fea0c4faf8be9bac6875a
jruthe [Fri, 14 Jul 2017 02:33:12 +0000 (02:33 +0000)]
test_vendor: Rename L2cap class to L2capPacket
am:
d930fac3df
Change-Id: I0be5142270dedcb774a2ba00ca1e670329d222b9
jruthe [Thu, 13 Jul 2017 23:09:59 +0000 (16:09 -0700)]
test_vendor: Rename L2cap class to L2capPacket
Test: Compiles
Change-Id: I851d2af8bfeb906cee754531e72e94a832413194
Pavlin Radoslavov [Thu, 13 Jul 2017 21:00:46 +0000 (21:00 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a am:
df16497d1c -s ours am:
9aad8b3ffe -s ours am:
cc385a427b -s ours am:
0f5399e25e -s ours am:
57946b3779 -s ours am:
9c882ece29 -s ours
am:
afe11be8ab -s ours
Change-Id: I3f29b021039e34c389665a16eb387a85b7cb2366
Pavlin Radoslavov [Thu, 13 Jul 2017 21:00:09 +0000 (21:00 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am:
db82859274 am:
c901f08122 am:
90272aae6f am:
a8ea2147b9 am:
450fb2d257 -s ours
am:
9f906b88a5 -s ours
Change-Id: Ib696a4a65b960a6d9426b73b9b430cb67492a73c
Pavlin Radoslavov [Thu, 13 Jul 2017 20:57:55 +0000 (20:57 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42 am:
7a30f0c78a am:
9dc57eff7a am:
9a7909fefe am:
a51ce5e8f9 am:
fd92240684 am:
c9c96268fc am:
fb40df875d -s ours
am:
4dc9c853a2 -s ours
Change-Id: Ia49c68e44daae154eb08c9663f729ddeb0961295
Pavlin Radoslavov [Thu, 13 Jul 2017 20:57:31 +0000 (20:57 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd am:
f4cca28ce7 am:
c18777c2e6 am:
e562fc49d3 am:
becc43ca60 am:
9148341c11 -s ours
am:
343ebf47be
Change-Id: I563ba24324fe60e71c935d7cf530f4632e9aee97
Pavlin Radoslavov [Thu, 13 Jul 2017 20:57:16 +0000 (20:57 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours am:
a6996df21f -s ours am:
2fcebaa235 -s ours am:
4115bbb8f5 -s ours am:
014e50f138 -s ours am:
8512c504ab -s ours
am:
1c6f842334 -s ours
Change-Id: I2498e8d8fdc4117562adfabba78c1502f2197795
Pavlin Radoslavov [Thu, 13 Jul 2017 20:56:55 +0000 (20:56 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours am:
f79aebe2b9 -s ours am:
9005269de3 -s ours am:
c464bfcd50 -s ours am:
f728c0d6cd -s ours am:
37a0953a2f -s ours
am:
091d2acaf8
Change-Id: Icd6e985912868e7f7222522fd069900510abf855
Pavlin Radoslavov [Thu, 13 Jul 2017 20:56:11 +0000 (20:56 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am:
ee18c2bdd9 am:
cf3547d9a2 am:
0141629f97 am:
d79fd6108c am:
acb2d613e8 -s ours
am:
92633956fe
Change-Id: I2907656b79e4761fa29ac58bef80d63237d128ee
Pavlin Radoslavov [Thu, 13 Jul 2017 20:55:51 +0000 (20:55 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
510697a0d7 am:
5da7401f62 am:
6a44d1821b am:
4e8db0e0b4 am:
8a6b2b86ba -s ours
am:
b3639fc6d3 -s ours
Change-Id: If9f15e6bc6f2d3bdca6af21cf7087130a35a0471
Pavlin Radoslavov [Thu, 13 Jul 2017 20:55:28 +0000 (20:55 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev
am:
8109294976
Change-Id: Id5ad35b2411c48c65bb78634515a4aa8b611b7c8
Pavlin Radoslavov [Thu, 13 Jul 2017 20:54:59 +0000 (20:54 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev
am:
5dbe611a15
Change-Id: I8b07362df027405279f0f37f7f207609fc5ac292
Pavlin Radoslavov [Thu, 13 Jul 2017 19:37:17 +0000 (19:37 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a am:
df16497d1c -s ours am:
9aad8b3ffe -s ours am:
cc385a427b -s ours am:
0f5399e25e -s ours am:
57946b3779 -s ours
am:
9c882ece29 -s ours
Change-Id: I2e3c034c74db6a976c01f2df9c7a23c6ff8fd4e6
Pavlin Radoslavov [Thu, 13 Jul 2017 19:34:44 +0000 (19:34 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a am:
df16497d1c -s ours am:
9aad8b3ffe -s ours am:
cc385a427b -s ours am:
0f5399e25e -s ours
am:
57946b3779 -s ours
Change-Id: I9bf4f013b9faf00ccfafd0c055b7a49cfe432406
Pavlin Radoslavov [Thu, 13 Jul 2017 19:32:43 +0000 (19:32 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a am:
df16497d1c -s ours am:
9aad8b3ffe -s ours am:
cc385a427b -s ours
am:
0f5399e25e -s ours
Change-Id: I01ab9c13bd3615bd5896144938a10d9d84b802cc
Pavlin Radoslavov [Thu, 13 Jul 2017 19:30:12 +0000 (19:30 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a am:
df16497d1c -s ours am:
9aad8b3ffe -s ours
am:
cc385a427b -s ours
Change-Id: I449a4ffdc5cfff42c8c73a2e8e5e7654d4036508
Pavlin Radoslavov [Thu, 13 Jul 2017 19:27:42 +0000 (19:27 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a am:
df16497d1c -s ours
am:
9aad8b3ffe -s ours
Change-Id: I04d5e837ffa4142d9a4b4db92a9cf63f5fc48e29
Pavlin Radoslavov [Thu, 13 Jul 2017 19:25:41 +0000 (19:25 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f am:
19b22ffe8a
am:
df16497d1c -s ours
Change-Id: I43ac50a1683bef1b0f92f03296ba68f6dc0880da
Pavlin Radoslavov [Thu, 13 Jul 2017 19:22:46 +0000 (19:22 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569 am:
494625245f
am:
19b22ffe8a
Change-Id: Ia027b6cc651ffc920d5fafb7f8dad8f442220706
Pavlin Radoslavov [Thu, 13 Jul 2017 19:20:43 +0000 (19:20 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am:
db82859274 am:
c901f08122 am:
90272aae6f am:
a8ea2147b9
am:
450fb2d257 -s ours
Change-Id: I2c73490c21fd056202eda069c6dfddcbd9a4f8ec
Pavlin Radoslavov [Thu, 13 Jul 2017 19:20:42 +0000 (19:20 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am:
c41ba8a569
am:
494625245f
Change-Id: I3de1f423efacac96493de69033538157be2ca8f9
Pavlin Radoslavov [Thu, 13 Jul 2017 19:18:47 +0000 (19:18 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev
am:
c41ba8a569
Change-Id: I85c402bbc30c9954c71be3fe907651b76387653a
Pavlin Radoslavov [Thu, 13 Jul 2017 19:18:43 +0000 (19:18 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am:
db82859274 am:
c901f08122 am:
90272aae6f
am:
a8ea2147b9
Change-Id: I428d8e381602e1edbd65386587a3454e04c656cb
Pavlin Radoslavov [Thu, 13 Jul 2017 19:16:12 +0000 (19:16 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am:
db82859274 am:
c901f08122
am:
90272aae6f
Change-Id: I44562a64815240f202ad96ee0082c1a18b8ce922
Pavlin Radoslavov [Thu, 13 Jul 2017 19:13:42 +0000 (19:13 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am:
db82859274
am:
c901f08122
Change-Id: Ibdc8cb8e87163eeb9caa8e3c0b519a412293d07e
Pavlin Radoslavov [Thu, 13 Jul 2017 19:11:44 +0000 (19:11 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev
am:
db82859274
Change-Id: I2341681c821d2902ba79d652edb55167f26b7153
TreeHugger Robot [Thu, 13 Jul 2017 19:09:02 +0000 (19:09 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev
TreeHugger Robot [Thu, 13 Jul 2017 19:01:54 +0000 (19:01 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev
Pavlin Radoslavov [Thu, 13 Jul 2017 18:48:43 +0000 (11:48 -0700)]
resolve merge conflicts of
7d0ad232f to oc-dev-plus-aosp
Test: Code inspection.
Change-Id: I13a192920f58d8cea622a6acb2fb46fd07fdd195
Pavlin Radoslavov [Thu, 13 Jul 2017 18:35:30 +0000 (18:35 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42 am:
7a30f0c78a am:
9dc57eff7a am:
9a7909fefe am:
a51ce5e8f9 am:
fd92240684 am:
c9c96268fc
am:
fb40df875d -s ours
Change-Id: I204c2eafb5b7d65bda4abcfb1cc8326548b1c507
Pavlin Radoslavov [Thu, 13 Jul 2017 18:35:14 +0000 (18:35 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd am:
f4cca28ce7 am:
c18777c2e6 am:
e562fc49d3 am:
becc43ca60
am:
9148341c11 -s ours
Change-Id: I041ec096fd9419783bfbaf52998250f1a6b86b39
Pavlin Radoslavov [Thu, 13 Jul 2017 18:34:59 +0000 (18:34 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours am:
a6996df21f -s ours am:
2fcebaa235 -s ours am:
4115bbb8f5 -s ours am:
014e50f138 -s ours
am:
8512c504ab -s ours
Change-Id: I0c15e25f71a3a24f9a652b5ccfd0b9c5a454a4e8
Pavlin Radoslavov [Thu, 13 Jul 2017 18:34:40 +0000 (18:34 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours am:
f79aebe2b9 -s ours am:
9005269de3 -s ours am:
c464bfcd50 -s ours am:
f728c0d6cd -s ours
am:
37a0953a2f -s ours
Change-Id: Ia591d50d3e2bfd54a5d1f574f883e9db99369c4b
Pavlin Radoslavov [Thu, 13 Jul 2017 18:33:01 +0000 (18:33 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42 am:
7a30f0c78a am:
9dc57eff7a am:
9a7909fefe am:
a51ce5e8f9 am:
fd92240684
am:
c9c96268fc
Change-Id: Icdfb4c0ff269f4ea378170f7be4a22d3921b18be
Pavlin Radoslavov [Thu, 13 Jul 2017 18:32:47 +0000 (18:32 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd am:
f4cca28ce7 am:
c18777c2e6 am:
e562fc49d3
am:
becc43ca60
Change-Id: I8eabf2bc2931ca674678fbbf3d65b9da9ca7e6bd
Pavlin Radoslavov [Thu, 13 Jul 2017 18:32:28 +0000 (18:32 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours am:
a6996df21f -s ours am:
2fcebaa235 -s ours am:
4115bbb8f5 -s ours
am:
014e50f138 -s ours
Change-Id: Idebb4a822e6978ea91fc47833f05677fba92a37d
Pavlin Radoslavov [Thu, 13 Jul 2017 18:32:10 +0000 (18:32 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours am:
f79aebe2b9 -s ours am:
9005269de3 -s ours am:
c464bfcd50 -s ours
am:
f728c0d6cd -s ours
Change-Id: I1a85ce7d1cf860bb251d6899dbdf2b05bd2bcb6e
Pavlin Radoslavov [Thu, 13 Jul 2017 18:30:31 +0000 (18:30 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42 am:
7a30f0c78a am:
9dc57eff7a am:
9a7909fefe am:
a51ce5e8f9
am:
fd92240684
Change-Id: I250289a3e98e5ae0131276cfb2a7bc5f07aea1b7
Pavlin Radoslavov [Thu, 13 Jul 2017 18:30:14 +0000 (18:30 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd am:
f4cca28ce7 am:
c18777c2e6
am:
e562fc49d3
Change-Id: I35d5a9719f2f554d4211b597cd776ec66824f062
Pavlin Radoslavov [Thu, 13 Jul 2017 18:29:57 +0000 (18:29 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours am:
a6996df21f -s ours am:
2fcebaa235 -s ours
am:
4115bbb8f5 -s ours
Change-Id: Idb37536609bac94fa1dfb001c5e63d765ad0e9ee
Pavlin Radoslavov [Thu, 13 Jul 2017 18:29:39 +0000 (18:29 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours am:
f79aebe2b9 -s ours am:
9005269de3 -s ours
am:
c464bfcd50 -s ours
Change-Id: I97811392efb8e88411006d43d4d499599392f682
Pavlin Radoslavov [Thu, 13 Jul 2017 18:27:29 +0000 (18:27 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42 am:
7a30f0c78a am:
9dc57eff7a am:
9a7909fefe
am:
a51ce5e8f9
Change-Id: I07ab0843b58d95cfd0261cd54dc65cd40a184bef
Pavlin Radoslavov [Thu, 13 Jul 2017 18:27:14 +0000 (18:27 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd am:
f4cca28ce7
am:
c18777c2e6
Change-Id: I8e30d779ab33a28a6e11f8671a490e92b55fe2da
Pavlin Radoslavov [Thu, 13 Jul 2017 18:26:57 +0000 (18:26 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours am:
a6996df21f -s ours
am:
2fcebaa235 -s ours
Change-Id: I8c0a6e3e8fdafb24739a9f267b944507b287db91
Pavlin Radoslavov [Thu, 13 Jul 2017 18:26:40 +0000 (18:26 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours am:
f79aebe2b9 -s ours
am:
9005269de3 -s ours
Change-Id: Ia2e716810d7a667becfe79b5ce5995225ed57648
OSDN Git Service
