OSDN Git Service
Pavlin Radoslavov [Thu, 13 Jul 2017 20:57:16 +0000 (20:57 +0000)]
Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am:
d2a3649d6e am:
27db9becc7 am:
84714e10d8 am:
8ec036d751 -s ours am:
a6996df21f -s ours am:
2fcebaa235 -s ours am:
4115bbb8f5 -s ours am:
014e50f138 -s ours am:
8512c504ab -s ours
am:
1c6f842334 -s ours
Change-Id: I2498e8d8fdc4117562adfabba78c1502f2197795
Pavlin Radoslavov [Thu, 13 Jul 2017 20:56:55 +0000 (20:56 +0000)]
Disable PAN Reverse Tethering when connection originated by the Remote am:
f7a7f7a948 am:
b4cf6c5aa7 am:
5d9bbfe453 am:
c80b2fc096 -s ours am:
f79aebe2b9 -s ours am:
9005269de3 -s ours am:
c464bfcd50 -s ours am:
f728c0d6cd -s ours am:
37a0953a2f -s ours
am:
091d2acaf8
Change-Id: Icd6e985912868e7f7222522fd069900510abf855
Pavlin Radoslavov [Thu, 13 Jul 2017 20:56:11 +0000 (20:56 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am:
ee18c2bdd9 am:
cf3547d9a2 am:
0141629f97 am:
d79fd6108c am:
acb2d613e8 -s ours
am:
92633956fe
Change-Id: I2907656b79e4761fa29ac58bef80d63237d128ee
Pavlin Radoslavov [Thu, 13 Jul 2017 20:55:51 +0000 (20:55 +0000)]
Allocate buffers of the right size when BT_HDR is included am:
510697a0d7 am:
5da7401f62 am:
6a44d1821b am:
4e8db0e0b4 am:
8a6b2b86ba -s ours
am:
b3639fc6d3 -s ours
Change-Id: If9f15e6bc6f2d3bdca6af21cf7087130a35a0471
Pavlin Radoslavov [Thu, 13 Jul 2017 20:55:28 +0000 (20:55 +0000)]
Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev
am:
8109294976
Change-Id: Id5ad35b2411c48c65bb78634515a4aa8b611b7c8
Pavlin Radoslavov [Thu, 13 Jul 2017 20:54:59 +0000 (20:54 +0000)]
Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev
am:
5dbe611a15
Change-Id: I8b07362df027405279f0f37f7f207609fc5ac292
Pavlin Radoslavov [Thu, 13 Jul 2017 18:48:43 +0000 (11:48 -0700)]
resolve merge conflicts of
7d0ad232f to oc-dev-plus-aosp
Test: Code inspection.
Change-Id: I13a192920f58d8cea622a6acb2fb46fd07fdd195
Pavlin Radoslavov [Thu, 13 Jul 2017 18: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
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
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: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 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)
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: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
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
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: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
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
Android Build Merger (Role) [Fri, 7 Jul 2017 06:37:24 +0000 (06:37 +0000)]
Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp
Jiyong Park [Fri, 7 Jul 2017 06:37:15 +0000 (06:37 +0000)]
Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a
am:
9ae297d02c
Change-Id: Id9d7b0469261cde673a9d3206eb789f089967fd3
Jiyong Park [Fri, 7 Jul 2017 06:37:05 +0000 (06:37 +0000)]
Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a
am:
9ae297d02c
Change-Id: I9257d4773e2e5b69ae21370e3b5b362967b9f123
Jiyong Park [Fri, 7 Jul 2017 06:33:15 +0000 (06:33 +0000)]
Merge "Mark libbluetooth-types as vendor_available"
am:
29f359181a
Change-Id: Ic63d5ccafceb91f2eddf3a41c8a3b8be6d200b0c
Treehugger Robot [Fri, 7 Jul 2017 06:27:41 +0000 (06:27 +0000)]
Merge "Mark libbluetooth-types as vendor_available"
Jinguang Dong [Fri, 7 Jul 2017 06:06:43 +0000 (06:06 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING am:
549ec693c2
am:
b415ac8648
Change-Id: I571bc39274f4f99663948789b323eba6c598b5f6
Jinguang Dong [Fri, 7 Jul 2017 06:02:43 +0000 (06:02 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING
am:
549ec693c2
Change-Id: I8c9ea5fad01fbb68b9f7067f7682cc9cd870daa2
Jinguang Dong [Wed, 28 Jun 2017 01:50:37 +0000 (09:50 +0800)]
Do not delete device record on HCI_ERR_KEY_MISSING
If an auth_complete event is received with HCI_ERR_KEY_MISSING, the
p_dev_rec->sm4 flag will be set to "BTM_SM4_UNKNOWN" in the
BTM_SecClearSecurityFlags() function. This will prevent the
BTM_SM4_RETRY procedure from being executed, which can cause
pairing failures.
To reproduce:
1. Two Phones, A: Android O, B: Android N.
2. Enable B in Bluetooth visable mode
3. A start discovery and create pairing with B successfully
4. B cancel pairing with A by remove A from pairing device
list of B.
5. A create paring with B again by touch paired device in A,
this first step will be failed.
Bug:
62615213
Test: manual
Change-Id: I514ba2f4d0fd2621c11bd83aeec24b8c6c6d2d5a
Signed-off-by: Yequan Song <songyequan@huawei.com>
Jiyong Park [Fri, 7 Jul 2017 04:29:16 +0000 (13:29 +0900)]
Mark libbluetooth-types as vendor_available
libbluetooty-types is used by a vendor module
android.hardware.bluetooth@1.0-service.sim, thus marking it as
vendor_available so that the lib is allowed for the HAL service when
building with BOARD_VNDK_VERSION.
Bug:
37342627
Test: BOARD_VNDK_VERSION=current m -j
android.hardware.bluetooth@1.0-service.sim
Change-Id: I39d071fc249ce6842e7175751abd6249b9367231
Android Build Merger (Role) [Fri, 7 Jul 2017 01:43:38 +0000 (01:43 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:27 +0000 (01:43 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
am:
4669be25d5 -s ours
Change-Id: Ida9eb27eab54f87d9791dcb7108cb7351aec4fa2
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:19 +0000 (01:43 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
am:
4669be25d5 -s ours
Change-Id: Id8d611928dc23949ec94cf24ce5ec818e0df48b8
Jakub Pawlowski [Fri, 7 Jul 2017 01:40:14 +0000 (01:40 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744
am:
56978c211d -s ours
Change-Id: Ib77fc61181d7e8ee035a706e149868699a9decc1
Jakub Pawlowski [Fri, 7 Jul 2017 01:38:05 +0000 (01:38 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744
am:
6ad7d19e69
Change-Id: I56c4b867de829c86dd4f742ac1fce01ce2951f4b
Android Build Merger (Role) [Fri, 7 Jul 2017 01:37:41 +0000 (01:37 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
Jakub Pawlowski [Fri, 7 Jul 2017 01:36:41 +0000 (01:36 +0000)]
Merge "Make RawAddress into a class (1/3)"
am:
4a1fc85744
Change-Id: I61d249aa17044cd55b6834bc9563f648362621b6
Jakub Pawlowski [Fri, 7 Jul 2017 01:35:36 +0000 (01:35 +0000)]
Merge "Make RawAddress into a class (1/3)"
am:
4a1fc85744
Change-Id: I05b23ab3aff4d61dd8b04a3f011e832305203ce5
Treehugger Robot [Fri, 7 Jul 2017 01:29:30 +0000 (01:29 +0000)]
Merge "Make RawAddress into a class (1/3)"
Myles Watson [Thu, 6 Jul 2017 23:09:42 +0000 (23:09 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master
am:
1b8043bbe0
Change-Id: I74ab0fb68ea45e31ab517a553d98e612c40b47ff
Myles Watson [Thu, 6 Jul 2017 23:09:26 +0000 (23:09 +0000)]
Remove unused BDADDR definitions am:
525e743277
am:
799a72b7c2
Change-Id: Id08c1c926e2ff224d44a5cdd72f75c1391347e89
Android Build Merger (Role) [Thu, 6 Jul 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master
Myles Watson [Thu, 6 Jul 2017 22:56:19 +0000 (22:56 +0000)]
Remove unused BDADDR definitions
am:
525e743277
Change-Id: I211d82d42a53fe9bb2a6b930c7d99d5187b4f850
Myles Watson [Thu, 6 Jul 2017 22:56:14 +0000 (22:56 +0000)]
Remove unused BDADDR definitions
am:
525e743277
Change-Id: I13b1c9dd558bf8662f5f9af0008df0740ec333ae
Jakub Pawlowski [Mon, 3 Jul 2017 22:39:36 +0000 (15:39 -0700)]
Make RawAddress into a class (1/3)
* Add libbluetooth-types - library containing types implementation, that
is common between stystem/bt and packages/apps/Bluetooth. It must be
included in every project using btif interface.
* Put Raw Address implementation into libbluetooth-types
* Unify all "to/from string" helper methods into ToString and FromString
* bd_addr_empty -> RawAddress::kEmpty
* bd_addr_any -> RawAddress::kAny
Also fix leaks in jni str2addr by adding ReleaseStringUTFChars
Test: types_unittest
Change-Id: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043
Merged-In: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043
Myles Watson [Wed, 28 Jun 2017 17:28:47 +0000 (10:28 -0700)]
Remove unused BDADDR definitions
The code that used these moved to the HAL.
Test: build
Change-Id: I4a25b525ff60c060143ea913c800c4dea8f676e1
Ajay Panicker [Thu, 6 Jul 2017 17:43:14 +0000 (17:43 +0000)]
Merge "Remove bta_closure in favor of posting messages to a message loop" am:
1c6f5e6a5c
am:
5e8da48d76
Change-Id: I4e88bb24985e18e5f29e60cde26c184d85b3fb79
Ajay Panicker [Thu, 6 Jul 2017 17:41:54 +0000 (17:41 +0000)]
Merge "Remove bta_closure in favor of posting messages to a message loop"
am:
1c6f5e6a5c
Change-Id: I8a90de11fea85a01747d35e655e24d9c3f0ad41b
Treehugger Robot [Thu, 6 Jul 2017 17:39:05 +0000 (17:39 +0000)]
Merge "Remove bta_closure in favor of posting messages to a message loop"
Pavlin Radoslavov [Thu, 6 Jul 2017 17:34:24 +0000 (17:34 +0000)]
Merge "Add missing lock protection when freeing RFCOMM port queues" am:
ea5319f3e0
am:
75236c40f6
Change-Id: I5fca11ed98a3f7b96228a8a207b989be956962ca
Pavlin Radoslavov [Thu, 6 Jul 2017 17:32:43 +0000 (17:32 +0000)]
Merge "Add missing lock protection when freeing RFCOMM port queues"
am:
ea5319f3e0
Change-Id: Idee0119a6aae76df40a65d91618fe42130768f65
Treehugger Robot [Thu, 6 Jul 2017 17:19:53 +0000 (17:19 +0000)]
Merge "Add missing lock protection when freeing RFCOMM port queues"
koh.changseok [Thu, 6 Jul 2017 02:21:06 +0000 (02:21 +0000)]
Merge "Merge "A2DP: Add mandatory elements for SBC SRC capabilities" am:
e0a0913672" into stage-aosp-master
am:
64305a2ac5
Change-Id: I0233ab022b485651821d16e1cf2f46d69b1d0a2c
koh.changseok [Thu, 6 Jul 2017 02:20:53 +0000 (02:20 +0000)]
Merge "A2DP: Add mandatory elements for SBC SRC capabilities" am:
e0a0913672
am:
09a943f17f
Change-Id: I49aeef656e17909b133123f89efcc5fbcb1c4346
Android Build Merger (Role) [Thu, 6 Jul 2017 02:10:53 +0000 (02:10 +0000)]
Merge "Merge "A2DP: Add mandatory elements for SBC SRC capabilities" am:
e0a0913672" into stage-aosp-master