OSDN Git Service
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
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: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: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
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: Ic8c4e4d473fb474626073b94c16af93ee1093d70
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: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: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: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: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: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)
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)
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 20:59:11 +0000 (20:59 +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: If441bdcc179c3f5e28b163a16fdfecb293374ebe
Pavlin Radoslavov [Thu, 13 Jul 2017 20:58:52 +0000 (20:58 +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: I130cc3e170fe393fec5592b9d8401d6198d91a9c
Pavlin Radoslavov [Thu, 13 Jul 2017 20:58:19 +0000 (20:58 +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: Iebf5aadf379d154597afa3735ab164e18520ab42
Pavlin Radoslavov [Thu, 13 Jul 2017 20:56:52 +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: Iac2fc4280421950fdb42dbcddaeb7dd170147b01
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: Id2b687eb3d16e6eec682a512bf05ed13f0ca9b23
Pavlin Radoslavov [Thu, 13 Jul 2017 20:55:52 +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: Ie3219423afceddbb0cbc32e33c8c50d2060a7330
Pavlin Radoslavov [Thu, 13 Jul 2017 20:55:17 +0000 (20:55 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev
am:
8109294976
Change-Id: I43121a744aede2a65efa8dd3995fdd1bb3dc8a2d
Pavlin Radoslavov [Thu, 13 Jul 2017 20:54:58 +0000 (20:54 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev
am:
5dbe611a15
Change-Id: Ie12b30c5fa2a871bad9f74986d0e7cf67368e226
TreeHugger Robot [Thu, 13 Jul 2017 20:51:10 +0000 (20:51 +0000)]
Merge "resolve merge conflicts of
7d0ad232f to oc-dr1-dev" into oc-dr1-dev
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
Timm Korte [Mon, 15 May 2017 06:30:00 +0000 (08:30 +0200)]
bt: fix sdp service name by removing NULL char
The Bluedroid stack uses a C string with terminating NULL char as a
service name. Since in BT, strings are TLV encoded (type, length,
value), this doesn't make sense.
Simple fix is to copy the string without the trailing NULL by
removing the "+1" after the strlen call when passing the string as
uint8_t array to the lower level functions.
The current behaviour keeps some older devices from being able to
connect to an Android providing a Serial Port profile due to having
the wrong service name (that is, including a NULL at the end instead
of the correct string).
Test: Checked against Linux BlueZ, which does not include this extra
null character.
Bug:
63665003
Change-Id: I6a43024ff89ac09e4b2d2e5cfb407b6e9323f0bd
Signed-off-by: Timm Korte <timm.korte@gmail.com>
(cherry picked from commit
625f798c696229b0cc58e5f85409fd029f987473)
Pavlin Radoslavov [Thu, 13 Jul 2017 18:37:19 +0000 (11:37 -0700)]
resolve merge conflicts of
7d0ad232f to oc-dr1-dev
Test: Code inspection.
Change-Id: I5406558028da5a52647dec7f4f691c6c68a5591e
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
Pavlin Radoslavov [Thu, 13 Jul 2017 18:24:37 +0000 (18:24 +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
Change-Id: I9734ec3d308ab8fb98a5923241fbab91ad81af28
Pavlin Radoslavov [Thu, 13 Jul 2017 18:24:21 +0000 (18:24 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089 am:
634fc84bbd
am:
f4cca28ce7
Change-Id: I634762cc7468a03ca94702153dc638ac5506d20a
Pavlin Radoslavov [Thu, 13 Jul 2017 18:24:04 +0000 (18:24 +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
Change-Id: Icef81edd5fec2d5edee0af3c02f4b85ea75a9d0f
Pavlin Radoslavov [Thu, 13 Jul 2017 18:23:39 +0000 (18:23 +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
Change-Id: I98be6f0d6399502bbf523e3531865a608111c076
Pavlin Radoslavov [Thu, 13 Jul 2017 18:21:35 +0000 (18:21 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42 am:
7a30f0c78a
am:
9dc57eff7a
Change-Id: Iefe422511cd90f86d95b7d5c576161aae80055e9
Pavlin Radoslavov [Thu, 13 Jul 2017 18:21:15 +0000 (18:21 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0 am:
da8e592089
am:
634fc84bbd
Change-Id: I35386fe81935831e344265a879e8ee2bc05e4dc7
Pavlin Radoslavov [Thu, 13 Jul 2017 18:20:57 +0000 (18:20 +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
Change-Id: I3735cfa1430daf543d5cbfdb1609176443feba86
Pavlin Radoslavov [Thu, 13 Jul 2017 18:20:40 +0000 (18:20 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453
am:
c80b2fc096 -s ours
Change-Id: I143dcc7f5db0b852b596eeb62ac78f1beda40b3c
Pavlin Radoslavov [Thu, 13 Jul 2017 18:19:03 +0000 (18:19 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d am:
6fca688b42
am:
7a30f0c78a
Change-Id: I77d2ac1b4e2e271d42cf555f66951217db7c7f05
Pavlin Radoslavov [Thu, 13 Jul 2017 18:18:49 +0000 (18:18 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9 am:
70ef60cac0
am:
da8e592089
Change-Id: Ibc97e933ab9dbcb262753946ca0bad8ed3fe716d
OSDN Git Service
