OSDN Git Service
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:22:55 +0000 (19:22 +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:
bc25939205 -s ours
Change-Id: I3bf45660c1b0204d48ad4462c5f4c2adbab80423
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: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: Ic8c4e4d473fb474626073b94c16af93ee1093d70
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: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: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
Android Build Merger (Role) [Tue, 18 Jul 2017 18:55:58 +0000 (18:55 +0000)]
Merge "Merge "Add missing extension length check while parsing BNEP control packets" into oc-dev am:
25fb3d4059 am:
db8ee59afe" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 18 Jul 2017 18:55:53 +0000 (18:55 +0000)]
Merge "Merge "Add missing extension length check while parsing BNEP control packets" into oc-dev am:
25fb3d4059 am:
b71aed3793" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:50 +0000 (18:55 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into oc-dev am:
25fb3d4059
am:
db8ee59afe
Change-Id: Ifaa3c04fce8336209bcdaf9aa3b143a6d8f1d2f7
Android Build Merger (Role) [Tue, 18 Jul 2017 18:55:46 +0000 (18:55 +0000)]
Merge "Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
a654681c55 am:
8525939d54" into oc-dr1-dev-plus-aosp
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 oc-dev am:
25fb3d4059
am:
b71aed3793
Change-Id: I869183c5c8d6e74410b4fb27646da355f371a010
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:55:33 +0000 (18:55 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
a654681c55
am:
8525939d54
Change-Id: I7f4e33001ddccfe70355988f1e32eb1ba0311d21
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:
a654681c55
am:
201eb44c00
Change-Id: I8378625c5a70086829b18ca7ac9cd8dc3e145f7f
Pavlin Radoslavov [Tue, 18 Jul 2017 18:51:36 +0000 (18:51 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into oc-dev
am:
25fb3d4059
Change-Id: Ic1e730642875799e8b9150479238b0b8f83eb932
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:
a654681c55
Change-Id: I56b802ed5140df47079be42ac686d8e10d554495
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:12 +0000 (18:45 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into oc-dev
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 [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:34:13 +0000 (23:34 +0000)]
test_vendor: Add LOG_DEBUG to L2cap::assemble am:
8d604d6ab0 am:
8fb366ebdc
am:
b521bff69c
Change-Id: I8c3fc9ed1b2948710cdd70890f56842e5ef58ee1
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:51:17 +0000 (17:51 +0000)]
test_vendor: Move SDU checks to L2capSdu am:
7d267611a4 am:
19e6b8bb34
am:
45b887fbbb
Change-Id: Icb104895de99eac684b8e286a936cb1c3ebad079
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:54:58 +0000 (16:54 +0000)]
Merge "Add LEN_UUID_128 type check while build UUID seq" am:
48942c700e am:
0b1297d5ed
am:
76bb87bca9
Change-Id: I44bf1baf255479cf9bdc4bb411d081490b317b98
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:58:03 +0000 (07:58 +0000)]
Linux build fix am:
d3988fd73c am:
a717c2324a
am:
c3d505ddf3
Change-Id: I73acc18ea0967aa6176832fd62a857dcd95296c6
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
johnshamoon [Sat, 15 Jul 2017 04:14:18 +0000 (04:14 +0000)]
test_vendor: Add L2cap and L2capSdu assemble tests am:
7552c35aec am:
89e5bba5a4
am:
f258c36a32
Change-Id: I754129277a18748e7e88d2612c2b8a85fac64b4d
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 01:08:04 +0000 (01:08 +0000)]
Advertise data parser - allow zero padding at end of packet
am:
efefc0bfc1
Change-Id: Ie2d324fb7c9fc54cc275e7294f3f715d89c80b71
Jakub Pawlowski [Sat, 15 Jul 2017 00:40:05 +0000 (00:40 +0000)]
Merge "Advertise data parser - allow zero padding at end of packet" am:
c45e5d2dca am:
6c7c052685
am:
85c4b37312
Change-Id: Ib6e37726d725d0f13273463b3dfcef73045daa17
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"
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
(cherry picked from commit
08b907b58b0fd8334268413f5e383c1a546f9b3a)
jruthe [Fri, 14 Jul 2017 23:02:26 +0000 (23:02 +0000)]
test_vendor: L2cap Assemble additional error check am:
16995c3a50 am:
fe1a007688
am:
7897fef3d8
Change-Id: Ia674522663dfedf9981a76784fc4eaa3d08d9a06
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:39:13 +0000 (02:39 +0000)]
test_vendor: Rename L2cap class to L2capPacket am:
d930fac3df am:
57e758ef3f
am:
fea6c41f5b
Change-Id: Ia6128406e967d2a79f24d0737fe06968ae8d858d
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:19:19 +0000 (21:19 +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
am:
c651055ed4 -s ours
Change-Id: Iaa096ad8c831461d908dc8a73181a958c55d11c1
Pavlin Radoslavov [Thu, 13 Jul 2017 21:18:36 +0000 (21: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 am:
450fb2d257 -s ours am:
9f906b88a5 -s ours
am:
0608327aba -s ours
Change-Id: If4021ea6c3cde97cff591def04763f3dec3ec68e
Android Build Merger (Role) [Thu, 13 Jul 2017 21:05:00 +0000 (21:05 +0000)]
Merge "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 am:
a036a8380b -s ours" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:49 +0000 (21:04 +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
am:
a036a8380b -s ours
Change-Id: I3a4572ead91e89e572d21deea66803f8fb7b2021
Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:43 +0000 (21:04 +0000)]
Merge "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 am:
97ce5d6a05 -s ours" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:35 +0000 (21:04 +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
am:
97ce5d6a05 -s ours
Change-Id: Ifb8ce4718e781b8325d391b49bc5ef89f3d76ed4
Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:33 +0000 (21:04 +0000)]
Merge "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 am:
7fe809d013 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:29 +0000 (21:04 +0000)]
Merge "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 am:
1a5653ed7a -s ours" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:21 +0000 (21:04 +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
am:
1a5653ed7a -s ours
Change-Id: Ib0c4db0ee8155136681796988b9fd0070cf47d97
Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:21 +0000 (21:04 +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
am:
7fe809d013 -s ours
Change-Id: Id769a27cbfdf07af70f72c68494676719425137b
Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:16 +0000 (21:04 +0000)]
Merge "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 am:
19f78847d6 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:15 +0000 (21:04 +0000)]
Merge "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 am:
36c30dcac6 -s ours" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:08 +0000 (21:04 +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
am:
19f78847d6 -s ours
Change-Id: I005772ab1f21e7821d7f36883927a8bdf4845d20
Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:06 +0000 (21:04 +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
am:
36c30dcac6 -s ours
Change-Id: I48973a95659efbc33ffab56a6ce6c6b7138331c5
Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:57 +0000 (21:03 +0000)]
Merge "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 am:
287f9b04ba -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:53 +0000 (21:03 +0000)]
Merge "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 am:
0cba741f81 -s ours" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:03:43 +0000 (21:03 +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
am:
287f9b04ba -s ours
Change-Id: I35ad53d2c4291562c5a3534b2090f66b0fcf9785
Pavlin Radoslavov [Thu, 13 Jul 2017 21:03:42 +0000 (21:03 +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
am:
0cba741f81 -s ours
Change-Id: Idd80e366a82d33af3fcb3bf95dbefca15ae76530
Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:35 +0000 (21:03 +0000)]
Merge "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 am:
df18684d5e" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:34 +0000 (21:03 +0000)]
Merge "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 am:
4c2b7fb76f" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:03:25 +0000 (21:03 +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
am:
df18684d5e
Change-Id: Idcbaa6dd1c3077d7033813316afc2570a526007e
Pavlin Radoslavov [Thu, 13 Jul 2017 21:03:20 +0000 (21:03 +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
am:
4c2b7fb76f
Change-Id: I1b5868986eefa0f261b8a33c30ffe9467d98015b
Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:17 +0000 (21:03 +0000)]
Merge "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 am:
088e0e63fd" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:14 +0000 (21:03 +0000)]
Merge "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 am:
21272f347e" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:03:09 +0000 (21:03 +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
am:
088e0e63fd
Change-Id: I71aabdb618b210e9f4f2980e7d0508a72405f5e5
Pavlin Radoslavov [Thu, 13 Jul 2017 21:03:03 +0000 (21:03 +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
am:
21272f347e
Change-Id: Ibaa0003f082169895e34c1c21d94477a58444720
Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:00 +0000 (21:03 +0000)]
Merge "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 am:
71915a09a7 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 13 Jul 2017 21:02:55 +0000 (21:02 +0000)]
Merge "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 am:
46fa78ebf4 -s ours" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:49 +0000 (21:02 +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
am:
71915a09a7 -s ours
Change-Id: I3d91e1b51fc69d35e969f69c9a33de6fc29cffe5
Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:46 +0000 (21:02 +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
am:
46fa78ebf4 -s ours
Change-Id: Ib15037aaf5efc1bdcc581a933dd1f7e738656f81
Android Build Merger (Role) [Thu, 13 Jul 2017 21:02:44 +0000 (21:02 +0000)]
Merge "Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev am:
8109294976 am:
74efc1091e" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 13 Jul 2017 21:02:40 +0000 (21:02 +0000)]
Merge "Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev am:
8109294976 am:
7ec12a4131" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:35 +0000 (21:02 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev am:
8109294976
am:
74efc1091e
Change-Id: Ifd14feff2ad2c14f8f2a083184f31c9799262468
Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:32 +0000 (21:02 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev am:
8109294976
am:
7ec12a4131
Change-Id: I98d90b733e4bd35642217a4dc3fd189af94edb36
Android Build Merger (Role) [Thu, 13 Jul 2017 21:02:30 +0000 (21:02 +0000)]
Merge "Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev am:
5dbe611a15 am:
c5aa3c795c" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:22 +0000 (21:02 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev am:
5dbe611a15
am:
c5aa3c795c
Change-Id: I513c751abc6eddad3f46590961e8e2c1a1c97d9a
Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:19 +0000 (21:02 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev am:
5dbe611a15
am:
e123e29253
Change-Id: Ie655edfde2f90a98f2b71cce52b92eade47ddabe
Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:11 +0000 (21:02 +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: Ibadff8dd2d1db19cc714f052a595c447b63b2ce2
Pavlin Radoslavov [Thu, 13 Jul 2017 21:01:53 +0000 (21:01 +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: I120df235a98289a2eac7f4e784738f410bb1cb81
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
OSDN Git Service
