git.osdn.net Git - android-x86/system-bt.git/log

(root) / android-x86 / system-bt.git / log

Pavlin Radoslavov [Thu, 13 Jul 2017 21:19:54 +0000 (21:19 +0000)]

Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am: db82859274 am: c901f08122 am: 90272aae6f am: a8ea2147b9 am: 450fb2d257 -s ours am: 9f906b88a5 -s ours am: 0608327aba -s ours
am: 3e5b356564 -s ours

Change-Id: I0a93cb691c67b39ca83f63e5207478d4d5d52bec

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:18:36 +0000 (21:18 +0000)]

Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am: db82859274 am: c901f08122 am: 90272aae6f am: a8ea2147b9 am: 450fb2d257 -s ours am: 9f906b88a5 -s ours
am: 0608327aba -s ours

Change-Id: If4021ea6c3cde97cff591def04763f3dec3ec68e

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:18:21 +0000 (21:18 +0000)]

Merge "Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am: c41ba8a569 am: 494625245f am: 19b22ffe8a am: df16497d1c -s ours am: 9aad8b3ffe -s ours am: cc385a427b -s ours am: 0f5399e25e -s ours am: 57946b3779 -s ours am: 9c882ece29 -s ours am: afe11be8ab -s ours am: a036a8380b -s ours" into oc-dr1-dev-plus-aosp
am: 93c8573eaf -s ours

Change-Id: I17998cba8453edea64ef362ea480ddb673c46da6

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:15:25 +0000 (21:15 +0000)]

Merge "Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am: db82859274 am: c901f08122 am: 90272aae6f am: a8ea2147b9 am: 450fb2d257 -s ours am: 9f906b88a5 -s ours am: 97ce5d6a05 -s ours" into oc-dr1-dev-plus-aosp
am: 46aba517e4 -s ours

Change-Id: Ic8c1a0269d3284f954aff57761eed845f9300fea

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:13:27 +0000 (21:13 +0000)]

Merge "Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am: 64d3ed3c9d am: 6fca688b42 am: 7a30f0c78a am: 9dc57eff7a am: 9a7909fefe am: a51ce5e8f9 am: fd92240684 am: c9c96268fc am: fb40df875d -s ours am: 4dc9c853a2 -s ours am: 7fe809d013 -s ours" into oc-dr1-dev-plus-aosp
am: d171646be0 -s ours

Change-Id: Ifa171bc11af8ad0da9843777f66f23e88e775f56

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:10:22 +0000 (21:10 +0000)]

Merge "Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am: 64d3ed3c9d am: 6fca688b42 am: 7a30f0c78a am: 9dc57eff7a am: 9a7909fefe am: a51ce5e8f9 am: fd92240684 am: c9c96268fc am: fb40df875d -s ours am: 4dc9c853a2 -s ours am: 1a5653ed7a -s ours" into oc-dr1-dev-plus-aosp
am: 95251c6205 -s ours

Change-Id: I21884da4b2884b8fe1e801c7fbd183924874ca61

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:10:00 +0000 (21:10 +0000)]

Merge "Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am: b5cb6103b9 am: 70ef60cac0 am: da8e592089 am: 634fc84bbd am: f4cca28ce7 am: c18777c2e6 am: e562fc49d3 am: becc43ca60 am: 9148341c11 -s ours am: 343ebf47be am: 19f78847d6 -s ours" into oc-dr1-dev-plus-aosp
am: c53645c103 -s ours

Change-Id: Icb9a355cc4c0fbd5e42d2460014eb112eb7fb7d0

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:09:32 +0000 (21:09 +0000)]

Merge "Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am: b5cb6103b9 am: 70ef60cac0 am: da8e592089 am: 634fc84bbd am: f4cca28ce7 am: c18777c2e6 am: e562fc49d3 am: becc43ca60 am: 9148341c11 -s ours am: 343ebf47be am: 36c30dcac6 -s ours" into oc-dr1-dev-plus-aosp
am: 63615544a3 -s ours

Change-Id: Iced2bb61aa0c93200a21626658a85f5e318834bf

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:08:29 +0000 (21:08 +0000)]

Merge "Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am: d2a3649d6e am: 27db9becc7 am: 84714e10d8 am: 8ec036d751 -s ours am: a6996df21f -s ours am: 2fcebaa235 -s ours am: 4115bbb8f5 -s ours am: 014e50f138 -s ours am: 8512c504ab -s ours am: 1c6f842334 -s ours am: 287f9b04ba -s ours" into oc-dr1-dev-plus-aosp
am: df65bdcdce -s ours

Change-Id: I60a396d5284e7869d143b4f7ce04e7c97faa1e3d

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:08:04 +0000 (21:08 +0000)]

Merge "Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am: d2a3649d6e am: 27db9becc7 am: 84714e10d8 am: 8ec036d751 -s ours am: a6996df21f -s ours am: 2fcebaa235 -s ours am: 4115bbb8f5 -s ours am: 014e50f138 -s ours am: 8512c504ab -s ours am: 1c6f842334 -s ours am: 0cba741f81 -s ours" into oc-dr1-dev-plus-aosp
am: c299c64517 -s ours

Change-Id: Idd68c36e1ba01f45b1d417b358ab22df2992478c

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:07:21 +0000 (21:07 +0000)]

Merge "Disable PAN Reverse Tethering when connection originated by the Remote am: f7a7f7a948 am: b4cf6c5aa7 am: 5d9bbfe453 am: c80b2fc096 -s ours am: f79aebe2b9 -s ours am: 9005269de3 -s ours am: c464bfcd50 -s ours am: f728c0d6cd -s ours am: 37a0953a2f -s ours am: 091d2acaf8 am: df18684d5e" into oc-dr1-dev-plus-aosp
am: 9ade4995d7 -s ours

Change-Id: I2fb587e2e0410bf09d54ff3fd80b5ce75d08087f

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:07:06 +0000 (21:07 +0000)]

Merge "Disable PAN Reverse Tethering when connection originated by the Remote am: f7a7f7a948 am: b4cf6c5aa7 am: 5d9bbfe453 am: c80b2fc096 -s ours am: f79aebe2b9 -s ours am: 9005269de3 -s ours am: c464bfcd50 -s ours am: f728c0d6cd -s ours am: 37a0953a2f -s ours am: 091d2acaf8 am: 4c2b7fb76f" into oc-dr1-dev-plus-aosp
am: 89927d476b -s ours

Change-Id: I01f2a013ab15380de25e9f3a13470c4f1181a678

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:06:48 +0000 (21:06 +0000)]

Merge "Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am: ee18c2bdd9 am: cf3547d9a2 am: 0141629f97 am: d79fd6108c am: acb2d613e8 -s ours am: 92633956fe am: 088e0e63fd" into oc-dr1-dev-plus-aosp
am: f58f92bf09 -s ours

Change-Id: I6c9411e3063a287d434c3669d9107be2d5098647

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:06:33 +0000 (21:06 +0000)]

Merge "Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am: ee18c2bdd9 am: cf3547d9a2 am: 0141629f97 am: d79fd6108c am: acb2d613e8 -s ours am: 92633956fe am: 21272f347e" into oc-dr1-dev-plus-aosp
am: 80e508b040 -s ours

Change-Id: If442602cb04e7323ce78f07a9db2dcf0fdf6a4cd

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:06:16 +0000 (21:06 +0000)]

Merge "Allocate buffers of the right size when BT_HDR is included am: 510697a0d7 am: 5da7401f62 am: 6a44d1821b am: 4e8db0e0b4 am: 8a6b2b86ba -s ours am: b3639fc6d3 -s ours am: 71915a09a7 -s ours" into oc-dr1-dev-plus-aosp
am: 815ba18bae -s ours

Change-Id: I0c29ada3c64665724e3b888272a1a4b1c27feb83

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:06:01 +0000 (21:06 +0000)]

Merge "Allocate buffers of the right size when BT_HDR is included am: 510697a0d7 am: 5da7401f62 am: 6a44d1821b am: 4e8db0e0b4 am: 8a6b2b86ba -s ours am: b3639fc6d3 -s ours am: 46fa78ebf4 -s ours" into oc-dr1-dev-plus-aosp
am: aa082c5387 -s ours

Change-Id: Id905f06b9e48de28182c0c61a15748970e9be0cc

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:05:47 +0000 (21:05 +0000)]

Merge "Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev am: 8109294976 am: 74efc1091e" into oc-dr1-dev-plus-aosp
am: d85027b899 -s ours

Change-Id: I9e8335389ba2074bfcf7e30c56cd80699a36dfc6

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:05:28 +0000 (21:05 +0000)]

Merge "Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev am: 8109294976 am: 7ec12a4131" into oc-dr1-dev-plus-aosp
am: 367ce17576 -s ours

Change-Id: Iad322d29b52e4d1c86ef76e8ecc72d9f3f64f8e8

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:05:04 +0000 (21:05 +0000)]

Merge "Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev am: 5dbe611a15 am: c5aa3c795c" into oc-dr1-dev-plus-aosp
am: 453a37f5b4 -s ours

Change-Id: Icfb71512fcbd20d8e3d298883e1425304330223f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:05:00 +0000 (21:05 +0000)]

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:51 +0000 (21:04 +0000)]

Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev am: 5dbe611a15 am: e123e29253
am: 1fab67468f -s ours

Change-Id: I46f1833d5c5d218a2f870ae11f257743fe327a0c

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:49 +0000 (21:04 +0000)]

Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am: c41ba8a569 am: 494625245f am: 19b22ffe8a am: df16497d1c -s ours am: 9aad8b3ffe -s ours am: cc385a427b -s ours am: 0f5399e25e -s ours am: 57946b3779 -s ours am: 9c882ece29 -s ours am: afe11be8ab -s ours
am: a036a8380b -s ours

Change-Id: I3a4572ead91e89e572d21deea66803f8fb7b2021

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:43 +0000 (21:04 +0000)]

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:35 +0000 (21:04 +0000)]

Merge "Add a missing check for PAN buffer size before copying data" into nyc-dev am: db82859274 am: c901f08122 am: 90272aae6f am: a8ea2147b9 am: 450fb2d257 -s ours am: 9f906b88a5 -s ours
am: 97ce5d6a05 -s ours

Change-Id: Ifb8ce4718e781b8325d391b49bc5ef89f3d76ed4

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:33 +0000 (21:04 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:29 +0000 (21:04 +0000)]

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:21 +0000 (21:04 +0000)]

Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am: 64d3ed3c9d am: 6fca688b42 am: 7a30f0c78a am: 9dc57eff7a am: 9a7909fefe am: a51ce5e8f9 am: fd92240684 am: c9c96268fc am: fb40df875d -s ours am: 4dc9c853a2 -s ours
am: 1a5653ed7a -s ours

Change-Id: Ib0c4db0ee8155136681796988b9fd0070cf47d97

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:21 +0000 (21:04 +0000)]

Merge "Add missing packet length checks while parsing BNEP control packets" into mnc-dev am: 64d3ed3c9d am: 6fca688b42 am: 7a30f0c78a am: 9dc57eff7a am: 9a7909fefe am: a51ce5e8f9 am: fd92240684 am: c9c96268fc am: fb40df875d -s ours am: 4dc9c853a2 -s ours
am: 7fe809d013 -s ours

Change-Id: Id769a27cbfdf07af70f72c68494676719425137b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:16 +0000 (21:04 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:04:15 +0000 (21:04 +0000)]

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:08 +0000 (21:04 +0000)]

Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am: b5cb6103b9 am: 70ef60cac0 am: da8e592089 am: 634fc84bbd am: f4cca28ce7 am: c18777c2e6 am: e562fc49d3 am: becc43ca60 am: 9148341c11 -s ours am: 343ebf47be
am: 19f78847d6 -s ours

Change-Id: I005772ab1f21e7821d7f36883927a8bdf4845d20

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:04:06 +0000 (21:04 +0000)]

Merge "Add missing continuation offset check for SDP continuation requests" into mnc-dev am: b5cb6103b9 am: 70ef60cac0 am: da8e592089 am: 634fc84bbd am: f4cca28ce7 am: c18777c2e6 am: e562fc49d3 am: becc43ca60 am: 9148341c11 -s ours am: 343ebf47be
am: 36c30dcac6 -s ours

Change-Id: I48973a95659efbc33ffab56a6ce6c6b7138331c5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:57 +0000 (21:03 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:53 +0000 (21:03 +0000)]

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:03:43 +0000 (21:03 +0000)]

Merge "Allocate buffers of the right size when BT_HDR is included" into mnc-dev am: d2a3649d6e am: 27db9becc7 am: 84714e10d8 am: 8ec036d751 -s ours am: a6996df21f -s ours am: 2fcebaa235 -s ours am: 4115bbb8f5 -s ours am: 014e50f138 -s ours am: 8512c504ab -s ours am: 1c6f842334 -s ours
am: 287f9b04ba -s ours

Change-Id: I35ad53d2c4291562c5a3534b2090f66b0fcf9785

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:35 +0000 (21:03 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:34 +0000 (21:03 +0000)]

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:03:25 +0000 (21:03 +0000)]

Disable PAN Reverse Tethering when connection originated by the Remote am: f7a7f7a948 am: b4cf6c5aa7 am: 5d9bbfe453 am: c80b2fc096 -s ours am: f79aebe2b9 -s ours am: 9005269de3 -s ours am: c464bfcd50 -s ours am: f728c0d6cd -s ours am: 37a0953a2f -s ours am: 091d2acaf8
am: df18684d5e

Change-Id: Idcbaa6dd1c3077d7033813316afc2570a526007e

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:17 +0000 (21:03 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:14 +0000 (21:03 +0000)]

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:03:09 +0000 (21:03 +0000)]

Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into nyc-dev am: ee18c2bdd9 am: cf3547d9a2 am: 0141629f97 am: d79fd6108c am: acb2d613e8 -s ours am: 92633956fe
am: 088e0e63fd

Change-Id: I71aabdb618b210e9f4f2980e7d0508a72405f5e5

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:03:00 +0000 (21:03 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:02:55 +0000 (21:02 +0000)]

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:49 +0000 (21:02 +0000)]

Allocate buffers of the right size when BT_HDR is included am: 510697a0d7 am: 5da7401f62 am: 6a44d1821b am: 4e8db0e0b4 am: 8a6b2b86ba -s ours am: b3639fc6d3 -s ours
am: 71915a09a7 -s ours

Change-Id: I3d91e1b51fc69d35e969f69c9a33de6fc29cffe5

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:02:44 +0000 (21:02 +0000)]

Merge "Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev am: 8109294976 am: 74efc1091e" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:02:40 +0000 (21:02 +0000)]

Merge "Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev am: 8109294976 am: 7ec12a4131" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:35 +0000 (21:02 +0000)]

Merge "Add missing continuation offset check for SDP continuation requests" into oc-dev am: 8109294976
am: 74efc1091e

Change-Id: Ifd14feff2ad2c14f8f2a083184f31c9799262468

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 13 Jul 2017 21:02:30 +0000 (21:02 +0000)]

Merge "Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev am: 5dbe611a15 am: c5aa3c795c" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:02:22 +0000 (21:02 +0000)]

Merge "Disable PAN Reverse Tethering when connection originated by the Remote" into oc-dev am: 5dbe611a15
am: c5aa3c795c

Change-Id: I513c751abc6eddad3f46590961e8e2c1a1c97d9a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:00:46 +0000 (21:00 +0000)]

Merge "Add a missing check for PAN buffer size before copying data" into mnc-dev am: c41ba8a569 am: 494625245f am: 19b22ffe8a am: df16497d1c -s ours am: 9aad8b3ffe -s ours am: cc385a427b -s ours am: 0f5399e25e -s ours am: 57946b3779 -s ours am: 9c882ece29 -s ours
am: afe11be8ab -s ours

Change-Id: I3f29b021039e34c389665a16eb387a85b7cb2366

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 21:00:09 +0000 (21:00 +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: Ib696a4a65b960a6d9426b73b9b430cb67492a73c

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 20:59:13 +0000 (20:59 +0000)]

Merge "Merge "resolve merge conflicts of 7d0ad232f to oc-dr1-dev" into oc-dr1-dev am: 79bc6a57df" into oc-dr1-dev-plus-aosp
am: 2ff4747af7 -s ours

Change-Id: I358095cd200211717bab254169bee6aff04906fc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 20:57:55 +0000 (20:57 +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: Ia49c68e44daae154eb08c9663f729ddeb0961295

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 20:57:53 +0000 (20:57 +0000)]

resolve merge conflicts of 7d0ad232f to oc-dev-plus-aosp am: aa7f7079f7
am: 65f92f4ac9 -s ours

Change-Id: I91c2bc48b6929f6e1131462544233822bc8cab59

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 20:57:31 +0000 (20:57 +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: I563ba24324fe60e71c935d7cf530f4632e9aee97

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 20:55:51 +0000 (20:55 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Timm Korte [Thu, 13 Jul 2017 19:37:11 +0000 (19:37 +0000)]

bt: fix sdp service name by removing NULL char am: 557d20fd26
am: 842bac7550

Change-Id: Ie1c54ddea9b6ffe34623b15777ddfc83c6b1504f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 13 Jul 2017 19:30:12 +0000 (19:30 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

system/bt

RSS Atom

About OSDN

Find Software

Develop Software

Help