OSDN Git Service
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
Pavlin Radoslavov [Thu, 13 Jul 2017 18:18:33 +0000 (18:18 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7
am:
84714e10d8
Change-Id: I1a88047cdf70026aaa57f747e4ce614b1d496df0
Pavlin Radoslavov [Thu, 13 Jul 2017 18:18:09 +0000 (18:18 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7
am:
5d9bbfe453
Change-Id: I0d39c39b4b573b7df297ed1d93191aff18712fec
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:48 +0000 (18:16 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am:
64d3ed3c9d
am:
6fca688b42
Change-Id: I2f4b155188edb226c208350addc1d342ef90a55a
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:35 +0000 (18:16 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am:
b5cb6103b9
am:
70ef60cac0
Change-Id: I17a95052722739e6329e9759fafe1c0a7acfa067
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:23 +0000 (18:16 +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
Change-Id: Iadd78e80ac0f6d6b198a2edd7d97492eb2f692cb
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:22 +0000 (18:16 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e
am:
27db9becc7
Change-Id: I5a5ea407d003fc297ee89837ff22fcc0d946c735
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:08 +0000 (18:16 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948
am:
b4cf6c5aa7
Change-Id: I915ceaf816dc806ba91da7791aa1b43460615935
Pavlin Radoslavov [Thu, 13 Jul 2017 18:16:07 +0000 (18:16 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
510697a0d7 am:
5da7401f62 am:
6a44d1821b am:
4e8db0e0b4
am:
8a6b2b86ba -s ours
Change-Id: I15e24d3ee6db3a03facf05df6a4b59c0bbd10e0f
Pavlin Radoslavov [Thu, 13 Jul 2017 18:14:31 +0000 (18:14 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev
am:
64d3ed3c9d
Change-Id: I2ec8b4f3b50082036ce1f335d36fd728cb9c3665
Pavlin Radoslavov [Thu, 13 Jul 2017 18:14:11 +0000 (18:14 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev
am:
b5cb6103b9
Change-Id: I12c131aa3543e524f669f038153de2dbcd6ca63a
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:55 +0000 (18:13 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev
am:
d2a3649d6e
Change-Id: I781ce0eb5e6ea5b8b8fb029afe6caf81bd9ca9fb
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:52 +0000 (18:13 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am:
ee18c2bdd9 am:
cf3547d9a2 am:
0141629f97
am:
d79fd6108c
Change-Id: Ibc5fee1b8c7f9b3a73a66ead8485b5b35418f1b6
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:38 +0000 (18:13 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote
am:
f7a7f7a948
Change-Id: I5d1c8050de38dde922f9891e70574205422ee7be
Pavlin Radoslavov [Thu, 13 Jul 2017 18:13:38 +0000 (18:13 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
510697a0d7 am:
5da7401f62 am:
6a44d1821b
am:
4e8db0e0b4
Change-Id: I4b45cfe89d4460520eca795858309a83886e6c70
Pavlin Radoslavov [Thu, 13 Jul 2017 18:11:26 +0000 (18:11 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am:
ee18c2bdd9 am:
cf3547d9a2
am:
0141629f97
Change-Id: I8635a23f75175bcde855ddf925ce2da0efd7de2b
Pavlin Radoslavov [Thu, 13 Jul 2017 18:11:07 +0000 (18:11 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
510697a0d7 am:
5da7401f62
am:
6a44d1821b
Change-Id: Idfaeec3e29c40905e50e69df944134e403d41a1b
Pavlin Radoslavov [Thu, 13 Jul 2017 18:08:51 +0000 (18:08 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am:
ee18c2bdd9
am:
cf3547d9a2
Change-Id: Ia5a9015eb954fd331c2a06120456b98baafc0f17
Pavlin Radoslavov [Thu, 13 Jul 2017 18:08:37 +0000 (18:08 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
510697a0d7
am:
5da7401f62
Change-Id: I551622b60e882a85a9c739ec22d08a5af55cb1c9
Pavlin Radoslavov [Thu, 13 Jul 2017 18:06:58 +0000 (18:06 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev
am:
ee18c2bdd9
Change-Id: I077fed75c11c360dd38d4988f08dca4dd8ddf604
Pavlin Radoslavov [Thu, 13 Jul 2017 18:06:36 +0000 (18:06 +0000)]
Allocate buffers of the right size when BT_HDR is included
am:
510697a0d7
Change-Id: I5ca796fc392413dbf7f89332d1172904f980fab5
TreeHugger Robot [Thu, 13 Jul 2017 18:05:30 +0000 (18:05 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev
TreeHugger Robot [Thu, 13 Jul 2017 18:05:09 +0000 (18:05 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev
TreeHugger Robot [Thu, 13 Jul 2017 18:04:48 +0000 (18:04 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev
TreeHugger Robot [Thu, 13 Jul 2017 18:02:23 +0000 (18:02 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev
TreeHugger Robot [Thu, 13 Jul 2017 17:53:39 +0000 (17:53 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev
Pavlin Radoslavov [Thu, 13 Jul 2017 00:33:42 +0000 (17:33 -0700)]
Add a missing check for PAN buffer size before copying data
Bug:
63146237
Test: External script
Change-Id: I3e9c8a767a8a2a80ff56ccb48c56ca0d4b8c3402
Merged-In: I3e9c8a767a8a2a80ff56ccb48c56ca0d4b8c3402
(cherry picked from commit
1d909399cb4259243dac2e531e3ce6ca1afa77e7)
(cherry picked from commit
aa486ad8b5ad6eaef732e5fa7f151495c8c3faf2)
(cherry picked from commit
a8a6a17fdfc8d930ba4ad18f92cf4453cc1a219e)
(cherry picked from commit
d1145e0af3507e37d4bd25f1833e22c5c716f0ac)
TreeHugger Robot [Thu, 13 Jul 2017 17:52:13 +0000 (17:52 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev
Pavlin Radoslavov [Thu, 13 Jul 2017 17:29:05 +0000 (17:29 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into oc-dev
am:
ff7bd36bb7
Change-Id: I1f4eda1132635ad3ee7016f7ad423cea20e293c9
TreeHugger Robot [Thu, 13 Jul 2017 17:25:27 +0000 (17:25 +0000)]
Merge "Add missing packet length checks while parsing BNEP control packets" into oc-dev
TreeHugger Robot [Thu, 13 Jul 2017 17:24:30 +0000 (17:24 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into oc-dev
Pavlin Radoslavov [Thu, 13 Jul 2017 17:19:07 +0000 (17:19 +0000)]
Allocate buffers of the right size when BT_HDR is included
am:
8810ffba99
Change-Id: Iba43743c47ce1e0dc0221177b0d168692fa44bdf
Pavlin Radoslavov [Thu, 13 Jul 2017 01:39:31 +0000 (18:39 -0700)]
Disable PAN Reverse Tethering when connection originated by the Remote
* Check for valid interactions between the three PAN profile roles per
Table 1 in PAN Profile v1.0 spec.
* Explicitly disable connections to the local PANU if the remote is
not PANU.
Bug:
63145701
Test: External script
Change-Id: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
Merged-In: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
(cherry picked from commit
9aea2c2f92dd5245f6b35d564ce8e471fec2b4ec)
(cherry picked from commit
3f2ee5b546b65b5b021779588316249276ed3827)
(cherry picked from commit
40c7cefb12ac1a70bf7b1c770c1ab21a5b3f229e)
(cherry picked from commit
f7a7f7a948e38195e8ca897785ac5d489082f0cc)
Pavlin Radoslavov [Thu, 6 Jul 2017 20:39:02 +0000 (13:39 -0700)]
Allocate buffers of the right size when BT_HDR is included
Bug:
63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
(cherry picked from commit
d88838a7237cd672d87b6b9cc8d56fff625fd1d5)
(cherry picked from commit
b648c7dfe45c57842d58576f558fdf8edff10bec)
(cherry picked from commit
338e0485940ab278e6a2dc12285ba0798b79cfa4)
Pavlin Radoslavov [Thu, 13 Jul 2017 02:10:12 +0000 (19:10 -0700)]
Add missing packet length checks while parsing BNEP control packets
Bug:
63146237
Test: External script
Change-Id: Ie778f3c99df81c85ed988f3af89b4edbcc2eeb99
Merged-In: Ie778f3c99df81c85ed988f3af89b4edbcc2eeb99
(cherry picked from commit
7feaeb006941a1494d7cdc0a2ffc4bb1004b38b4)
(cherry picked from commit
6d415839da570b94b0763f6ab444f0dd1321fc33)
(cherry picked from commit
c68554feb3ddfd31cdec6d81a4b73a959c1b2a09)
(cherry picked from commit
3775b3c49e5d62349fd1f3dfb743fabadb43ea75)
Pavlin Radoslavov [Thu, 13 Jul 2017 01:56:03 +0000 (18:56 -0700)]
Add missing continuation offset check for SDP continuation requests
Bug:
63146698
Test: External script
Change-Id: Iea52f1689dc12bfe0d4b57996f17db4bc3bd5983
Merged-In: Iea52f1689dc12bfe0d4b57996f17db4bc3bd5983
(cherry picked from commit
e776c834768bedd043ace7e5714390b61c96a248)
(cherry picked from commit
10ce685cb025f6854be4ecc5329f2f684fd9ea5d)
Pavlin Radoslavov [Thu, 13 Jul 2017 01:39:31 +0000 (18:39 -0700)]
Disable PAN Reverse Tethering when connection originated by the Remote
* Check for valid interactions between the three PAN profile roles per
Table 1 in PAN Profile v1.0 spec.
* Explicitly disable connections to the local PANU if the remote is
not PANU.
Bug:
63145701
Test: External script
Change-Id: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
Merged-In: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
(cherry picked from commit
9aea2c2f92dd5245f6b35d564ce8e471fec2b4ec)
(cherry picked from commit
3f2ee5b546b65b5b021779588316249276ed3827)
(cherry picked from commit
40c7cefb12ac1a70bf7b1c770c1ab21a5b3f229e)
Pavlin Radoslavov [Thu, 13 Jul 2017 00:33:42 +0000 (17:33 -0700)]
Add a missing check for PAN buffer size before copying data
Bug:
63146237
Test: External script
Change-Id: I3e9c8a767a8a2a80ff56ccb48c56ca0d4b8c3402
Merged-In: I3e9c8a767a8a2a80ff56ccb48c56ca0d4b8c3402
(cherry picked from commit
1d909399cb4259243dac2e531e3ce6ca1afa77e7)
(cherry picked from commit
aa486ad8b5ad6eaef732e5fa7f151495c8c3faf2)
(cherry picked from commit
a8a6a17fdfc8d930ba4ad18f92cf4453cc1a219e)
Pavlin Radoslavov [Thu, 6 Jul 2017 20:39:02 +0000 (13:39 -0700)]
Allocate buffers of the right size when BT_HDR is included
Bug:
63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
(cherry picked from commit
d88838a7237cd672d87b6b9cc8d56fff625fd1d5)
(cherry picked from commit
b648c7dfe45c57842d58576f558fdf8edff10bec)
Pavlin Radoslavov [Thu, 6 Jul 2017 23:51:35 +0000 (16:51 -0700)]
Add missing packet length checks while parsing BNEP control packets
Bug:
63146237
Test: External script
Change-Id: Ie778f3c99df81c85ed988f3af89b4edbcc2eeb99
Merged-In: Ie778f3c99df81c85ed988f3af89b4edbcc2eeb99
(cherry picked from commit
7feaeb006941a1494d7cdc0a2ffc4bb1004b38b4)
Pavlin Radoslavov [Sat, 8 Jul 2017 00:17:31 +0000 (17:17 -0700)]
Add missing continuation offset check for SDP continuation requests
Bug:
63146698
Test: External script
Change-Id: Iea52f1689dc12bfe0d4b57996f17db4bc3bd5983
Merged-In: Iea52f1689dc12bfe0d4b57996f17db4bc3bd5983
Pavlin Radoslavov [Fri, 7 Jul 2017 08:48:40 +0000 (01:48 -0700)]
Disable PAN Reverse Tethering when connection originated by the Remote
* Check for valid interactions between the three PAN profile roles per
Table 1 in PAN Profile v1.0 spec.
* Explicitly disable connections to the local PANU if the remote is
not PANU.
Bug:
63145701
Test: External script
Change-Id: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
Merged-In: I29a7e404ba7e4453b6a7c59148a2b3eb7395303a
Pavlin Radoslavov [Thu, 6 Jul 2017 23:58:24 +0000 (16:58 -0700)]
Add a missing check for PAN buffer size before copying data
Bug:
63146237
Test: External script
Change-Id: I3e9c8a767a8a2a80ff56ccb48c56ca0d4b8c3402
Merged-In: I3e9c8a767a8a2a80ff56ccb48c56ca0d4b8c3402
Pavlin Radoslavov [Thu, 6 Jul 2017 20:39:02 +0000 (13:39 -0700)]
Allocate buffers of the right size when BT_HDR is included
Bug:
63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Ajay Panicker [Wed, 12 Jul 2017 18:45:08 +0000 (11:45 -0700)]
Allow collection of Bluetooth firmware dumps in bugreports (3/3)
This patch is temporary and should be removed once the bug is resolved
Bug:
63390057
Test: Force a hci timeout and collect a bugreport on walleye
Change-Id: Idab6d87c1b0540ea325fa1019ea2c9e97f3218f2
Jack He [Thu, 29 Jun 2017 20:58:47 +0000 (13:58 -0700)]
GATT: Expose opportunistic client API to Java
* Opportunistic GATT connection allows system service to subscribe to
characteristic notifications without holding the BLE connection
* Exposing this flag to Java allows Android applications to use it
Bug:
63347806
Test: make, test on Android App
Change-Id: Ic470acd63bf45d1c33696abed1e93b30746fb7a2
Merged-In: Ic470acd63bf45d1c33696abed1e93b30746fb7a2
(cherry picked from commit
5120fedf20eb29fa65cef561c475d18d51197b25)