OSDN Git Service
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
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
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
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
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
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 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
Android Build Merger (Role) [Thu, 13 Jul 2017 20:55:11 +0000 (20:55 +0000)]
Merge "Merge "resolve merge conflicts of
7d0ad232f to oc-dr1-dev" into oc-dr1-dev am:
79bc6a57df" into oc-dr1-dev-plus-aosp
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 20:54:59 +0000 (20:54 +0000)]
Merge "resolve merge conflicts of
7d0ad232f to oc-dr1-dev" into oc-dr1-dev
am:
79bc6a57df
Change-Id: I5b8023cb9647735fdeda288f4543450e26a640e1
Pavlin Radoslavov [Thu, 13 Jul 2017 20:54:51 +0000 (20:54 +0000)]
resolve merge conflicts of
7d0ad232f to oc-dev-plus-aosp
am:
aa7f7079f7
Change-Id: Ica0e8327a1eb5ffcd5a60aa3cdd842943f508d15
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
Timm Korte [Thu, 13 Jul 2017 19:34:40 +0000 (19:34 +0000)]
bt: fix sdp service name by removing NULL char
am:
557d20fd26
Change-Id: I908826e02207f13affe62a33ea17093c50578d56
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
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: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: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: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: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: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: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: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: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: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: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
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
Android Build Merger (Role) [Thu, 13 Jul 2017 17:31:48 +0000 (17:31 +0000)]
Merge "Merge "Add a missing check for PAN buffer size before copying data" into oc-dev am:
ff7bd36bb7 am:
c1265822c8" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Thu, 13 Jul 2017 17:31:38 +0000 (17:31 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into oc-dev am:
ff7bd36bb7
am:
c1265822c8
Change-Id: Id9bbe63658f8697f130ab59e0fd8c03a7c0f6a9c
Pavlin Radoslavov [Thu, 13 Jul 2017 17:31:37 +0000 (17:31 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into oc-dev am:
ff7bd36bb7
am:
1a55b43f5c
Change-Id: Id3ca741665434246e0bf667949d65b576ff9fdc6
Pavlin Radoslavov [Thu, 13 Jul 2017 17:29:07 +0000 (17:29 +0000)]
Merge "Add a missing check for PAN buffer size before copying data" into oc-dev
am:
ff7bd36bb7
Change-Id: I8da8cfc4703923afd2bb8311a95250c39447f9bd
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:24:18 +0000 (17:24 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
8810ffba99
am:
0e590923e4 -s ours
Change-Id: I9b8d1a55ce8933d8e7d3c9e8f7aee595878f1f00
Pavlin Radoslavov [Thu, 13 Jul 2017 17:22:04 +0000 (17:22 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
8810ffba99
am:
c4d897fae0
Change-Id: I7d1d3df1901886b58fda82667ad9a34e86a12dee
Pavlin Radoslavov [Thu, 13 Jul 2017 17:19:10 +0000 (17:19 +0000)]
Allocate buffers of the right size when BT_HDR is included
am:
8810ffba99
Change-Id: I963e06b87ad133b661482df6e1b0fa8b8b15cbc4
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 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, 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)
Ajay Panicker [Thu, 13 Jul 2017 00:21:43 +0000 (00:21 +0000)]
Allow collection of Bluetooth firmware dumps in bugreports (3/3)
am:
0580dd639c
Change-Id: I0ee8952683ef818d0b67d8fc5127f499bf9360fb
Timm Korte [Thu, 13 Jul 2017 00:19:33 +0000 (00:19 +0000)]
Merge "bt: fix sdp service name by removing NULL char" am:
2766da83df am:
8eff94efb9
am:
a54843d018
Change-Id: Ie541597466ef3e2e7b92c3dcd283bae5eea3649e
Timm Korte [Thu, 13 Jul 2017 00:17:34 +0000 (00:17 +0000)]
Merge "bt: fix sdp service name by removing NULL char" am:
2766da83df
am:
8eff94efb9
Change-Id: I13ea9e2e243efd14d6a3b43b9428996f24586e7e
Timm Korte [Thu, 13 Jul 2017 00:15:03 +0000 (00:15 +0000)]
Merge "bt: fix sdp service name by removing NULL char"
am:
2766da83df
Change-Id: I57de21a3a368cfc0312cce5498bb0beb70ae5cc2
Treehugger Robot [Thu, 13 Jul 2017 00:09:27 +0000 (00:09 +0000)]
Merge "bt: fix sdp service name by removing NULL char"
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)
Jakub Pawlowski [Wed, 12 Jul 2017 22:59:27 +0000 (22:59 +0000)]
Make GATT server code more readable am:
b4e4799154 am:
dd80e5f674
am:
3688cf9d05
Change-Id: I443b22384d9ed6093c082ac199026233cb09bffa
Jakub Pawlowski [Wed, 12 Jul 2017 22:57:32 +0000 (22:57 +0000)]
Make GATT server code more readable am:
b4e4799154
am:
dd80e5f674
Change-Id: I61be21b37d2d0ea825412ad7cfecf3d7e74c905c
Jakub Pawlowski [Wed, 12 Jul 2017 22:55:28 +0000 (22:55 +0000)]
Make GATT server code more readable
am:
b4e4799154
Change-Id: I4ef576808d9f258a45f3158a94f285035944f1cc
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.
Change-Id: I6a43024ff89ac09e4b2d2e5cfb407b6e9323f0bd
Signed-off-by: Timm Korte <timm.korte@gmail.com>
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 [Wed, 12 Jul 2017 02:53:44 +0000 (02:53 +0000)]
GATT: Expose opportunistic client API to Java
am:
e6f40cd3d9 -s ours
Change-Id: Ibc12e12a8f2824b4324dae332dbf69d3624893e4
Jakub Pawlowski [Tue, 11 Jul 2017 22:36:48 +0000 (15:36 -0700)]
Make GATT server code more readable
Test: compilation test
Change-Id: Ia176d7a89ccb9590c80e5b6b8af5a3495bf2ab16
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)
jruthe [Tue, 11 Jul 2017 21:29:43 +0000 (21:29 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs" am:
2dd6b59d57 am:
9d153dd187
am:
a6cb7ae553
Change-Id: Ic7c88720d7e137ddb7fb4626381b3099a7843593
jruthe [Tue, 11 Jul 2017 21:26:23 +0000 (21:26 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs" am:
2dd6b59d57
am:
9d153dd187
Change-Id: I3844e71bb8faa237e552b31e5f5369b0f9462c50
jruthe [Tue, 11 Jul 2017 21:22:51 +0000 (21:22 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs"
am:
2dd6b59d57
Change-Id: If0995021d9201b91acaf49a891e2682e5a4f855e
Treehugger Robot [Tue, 11 Jul 2017 21:16:16 +0000 (21:16 +0000)]
Merge "test_vendor: Implement packet assembly for SDUs"
Jack He [Tue, 11 Jul 2017 20:46:28 +0000 (20:46 +0000)]
GATT: Expose opportunistic client API to Java am:
5120fedf20 am:
27a9e1249d
am:
ab98252aeb
Change-Id: If5d94a54390718d73f8d55aacbf1d7c78fc2db7b
Jack He [Tue, 11 Jul 2017 20:37:57 +0000 (20:37 +0000)]
GATT: Expose opportunistic client API to Java am:
5120fedf20
am:
27a9e1249d
Change-Id: I00f499f1851c2ab6459cbcca0c4d02380005a392
Jack He [Tue, 11 Jul 2017 20:24:11 +0000 (20:24 +0000)]
GATT: Expose opportunistic client API to Java
am:
5120fedf20
Change-Id: I96347363962687799e5ca56feefc40eef56ae7e2
Jakub Pawlowski [Tue, 11 Jul 2017 20:03:33 +0000 (20:03 +0000)]
Fix crashes on stack shutdown
am:
864cb9d2db -s ours
Change-Id: I5164357cda3907805cb48cf6fd3347c0ed1db41d
Jakub Pawlowski [Thu, 22 Jun 2017 19:45:30 +0000 (12:45 -0700)]
Fix crashes on stack shutdown
During stack shutdown, Unregister would sometimes get called after the
stack is already cleaned up, and the AdvertiseManager::Get would crash
on null check assertion. Ensure that stack is initialized before
Unregister call.
Bug:
37888261
Test: none
Change-Id: I7a4bbcd24ec7d24d21d04fe842985baaac899321
Merged-In: I7a4bbcd24ec7d24d21d04fe842985baaac899321
jruthe [Thu, 8 Jun 2017 22:33:32 +0000 (15:33 -0700)]
test_vendor: Implement packet assembly for SDUs
Created l2cap.* and l2cap_sdu.* for assembling an L2CAP packet from a
stream of SDU packets.
Test: Passed all tests in l2cap_test.cc and l2cap_sdu_test.cc
Change-Id: I64487ee67170b1dd4eda9555321b1ecf7ed57040
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:
35874078
Test: make, test on Android App
Change-Id: Ic470acd63bf45d1c33696abed1e93b30746fb7a2
Tom Turney [Fri, 7 Jul 2017 21:27:42 +0000 (21:27 +0000)]
Merge "Revert "Blacklist Kinivo BTC350 for Absolute Volume"" into oc-dr1-dev
am:
7e30dce07c
Change-Id: Ic44edb9e7a70144572f1a8866f39bc41b34e56ba
TreeHugger Robot [Fri, 7 Jul 2017 21:22:41 +0000 (21:22 +0000)]
Merge "Revert "Blacklist Kinivo BTC350 for Absolute Volume"" into oc-dr1-dev
Jinguang Dong [Fri, 7 Jul 2017 19:56:42 +0000 (19:56 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING
am:
8a836291dc
Change-Id: Ia26ee3594d1e608308b23e498caa5f47850de94c
Tom Turney [Fri, 7 Jul 2017 18:11:46 +0000 (18:11 +0000)]
Revert "Blacklist Kinivo BTC350 for Absolute Volume"
This reverts commit
84e8fa9b0873c31b6ee5dce53405db9e9ff77a31.
This is actually due to b/
63073544 not an issue with the device.
Change-Id: I8433adcfc7ff8f3bf8a16eccb72f0522fa896fef