OSDN Git Service
Martin Brabham [Mon, 3 Jun 2019 15:41:07 +0000 (08:41 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
ee34c562b2 am:
4fcab76aec
am:
e89aa63902 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic13cb2ca31f5324e090f7d6d3de675f002a2724f
Martin Brabham [Mon, 3 Jun 2019 15:35:07 +0000 (08:35 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
ee34c562b2
am:
4fcab76aec
Change-Id: Ib6cbfeb4f468b1a4a3180cb4f52ad5ff316daff7
Martin Brabham [Mon, 3 Jun 2019 15:30:07 +0000 (08:30 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
am:
ee34c562b2
Change-Id: I8f9c721a1c5186a579f95cdb1f44d0a8e5e14a87
TreeHugger Robot [Mon, 3 Jun 2019 15:14:28 +0000 (15:14 +0000)]
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev
Martin Brabham [Mon, 3 Jun 2019 05:48:33 +0000 (22:48 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev am:
594d13398c am:
fe782ba695
am:
63a7cba6ce
Change-Id: Icce93053514629dda42e58ee5628860d8aef8a78
Martin Brabham [Mon, 3 Jun 2019 05:48:29 +0000 (22:48 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a am:
3547f78e99 am:
6eded7543a
am:
5494852cb8 -s ours
am skip reason: subject contains skip directive
Change-Id: Id99b668d45dd746544d10dde38b5e9a6049ef92d
Martin Brabham [Mon, 3 Jun 2019 05:42:30 +0000 (22:42 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev am:
594d13398c
am:
fe782ba695
Change-Id: I91c17faf64d9dd53095296852c20790a074ff1ff
Martin Brabham [Mon, 3 Jun 2019 05:42:27 +0000 (22:42 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a am:
3547f78e99
am:
6eded7543a
Change-Id: I3392b0dffc7f630ad2ebf06d817c717415c4c1d5
Martin Brabham [Mon, 3 Jun 2019 05:37:31 +0000 (22:37 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev
am:
594d13398c
Change-Id: Iff0fa054a3bb4a685e77f421d868ad26a457cfa2
Martin Brabham [Mon, 3 Jun 2019 05:37:29 +0000 (22:37 -0700)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a
am:
3547f78e99
Change-Id: I7e50b87b5a855fc3e0414699c3328933ed8c4ced
TreeHugger Robot [Mon, 3 Jun 2019 05:29:39 +0000 (05:29 +0000)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f" into oc-dev
* changes:
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Martin Brabham [Mon, 3 Jun 2019 04:54:53 +0000 (21:54 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev am:
be07649450 am:
a13ce75b02
am:
908bb75ad7
Change-Id: If1007452948d2c8567c00559a548413ca22f6a7c
Martin Brabham [Mon, 3 Jun 2019 04:54:48 +0000 (21:54 -0700)]
[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f am:
f9ec56dffb am:
364dd10aed
am:
89f3f95225 -s ours
am skip reason: subject contains skip directive
Change-Id: I2d6ca7256b59316bc67772463a8ce618d4e0fef2
Martin Brabham [Mon, 3 Jun 2019 04:48:52 +0000 (21:48 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev am:
be07649450
am:
a13ce75b02
Change-Id: Ic94192cdb00bf8c7c3b151a3b43cf73aa88e56c6
Martin Brabham [Mon, 3 Jun 2019 04:48:48 +0000 (21:48 -0700)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f am:
f9ec56dffb
am:
364dd10aed
Change-Id: Ie6a3e110a1c32bfa02518d94e4426a300021690e
Martin Brabham [Mon, 3 Jun 2019 04:42:51 +0000 (21:42 -0700)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev
am:
be07649450
Change-Id: I40f15b86e59b389bb3fb8b5a061260d5976f7cbb
Martin Brabham [Mon, 3 Jun 2019 04:42:50 +0000 (21:42 -0700)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f
am:
f9ec56dffb
Change-Id: Ia29d0d2bfeed91f75ab343953a09473c3442b958
Martin Brabham [Mon, 3 Jun 2019 04:31:26 +0000 (04:31 +0000)]
Merge changes from topic "am-
57169ab6-1d56-417c-b7c3-
7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Martin Brabham [Fri, 31 May 2019 21:39:27 +0000 (14:39 -0700)]
[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7 am:
dc272a5302 am:
1422db72c6
am:
757fbd8c29 -s ours
am skip reason: subject contains skip directive
Change-Id: Iea59775e396c2eb224e7daa2f5532f15decb6c29
Martin Brabham [Fri, 31 May 2019 21:33:28 +0000 (14:33 -0700)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7 am:
dc272a5302
am:
1422db72c6
Change-Id: I04b90889c8186f3e21b73729e0e8f8cd1b6b2e3b
Martin Brabham [Fri, 31 May 2019 21:25:24 +0000 (14:25 -0700)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7
am:
dc272a5302
Change-Id: I8c85089522262e31ac3793184e34b28312750270
Android Build Merger (Role) [Fri, 31 May 2019 18:12:16 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23 skipped:
4e06b9023f
Change-Id: I216ca30d63a6706f8a61c79d36dc83cb7836b186
Android Build Merger (Role) [Fri, 31 May 2019 18:12:14 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7 am:
0433d94f23
Change-Id: I5e14764ec590cace5feddb7636c771b6febb5ca0
Android Build Merger (Role) [Fri, 31 May 2019 18:12:13 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6 am:
6097686fc7
Change-Id: I2752af09d0dcf821f29f2e423220e1b13ef15396
Android Build Merger (Role) [Fri, 31 May 2019 18:12:11 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c am:
c80a6ed6e6
Change-Id: Iaee48fb07517f32ea191eff26f359eca7151cd38
Android Build Merger (Role) [Fri, 31 May 2019 18:12:10 +0000 (18:12 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
042fe6394c
Change-Id: I025a3f1c1f261dfbc1b9bda02c835f437d85fcaa
Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c
Android Build Merger (Role) [Thu, 30 May 2019 16:56:02 +0000 (16:56 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7
Change-Id: I2e5ee164ea33bc6f845e34bc39a24f0080d9bbe9
Android Build Merger (Role) [Thu, 30 May 2019 16:55:59 +0000 (16:55 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60
Change-Id: I8d3abdacbf67c5f8cbd1cf3b1fb63528b4a95811
Android Build Merger (Role) [Thu, 30 May 2019 16:55:56 +0000 (16:55 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc
Change-Id: I3d8a71cad06115d2be87a8c8a6b961ffa2827709
Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c
Android Build Merger (Role) [Wed, 29 May 2019 19:18:00 +0000 (19:18 +0000)]
[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped:
17c45d587a
Change-Id: I7677e2e0a7bf0f67e881a29fecd104c7e70cd0bf
Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c
Martin Brabham [Fri, 24 May 2019 22:13:38 +0000 (15:13 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: If65a8d53ff368ba3ddddb47cfc0072469090b46a
(cherry picked from commit
ddae6274742e241c03526c7659dca7b3446b9f8d)
Martin Brabham [Fri, 24 May 2019 22:13:38 +0000 (15:13 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: If65a8d53ff368ba3ddddb47cfc0072469090b46a
(cherry picked from commit
ddae6274742e241c03526c7659dca7b3446b9f8d)
Jakub Pawlowski [Wed, 29 May 2019 17:57:39 +0000 (10:57 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61 am:
a65c805c8c
am:
46d990360b -s ours
am skip reason: subject contains skip directive
Change-Id: I12088a8d0fcd6faa30f5b0e4ca5dbc8d4dd88c05
Jakub Pawlowski [Wed, 29 May 2019 17:52:39 +0000 (10:52 -0700)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913 am:
e1fb3fdd61
am:
a65c805c8c
Change-Id: I550868a91866949b0ee0e4d2f5d5031f079a824a
Jakub Pawlowski [Wed, 29 May 2019 17:48:40 +0000 (10:48 -0700)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913
am:
e1fb3fdd61
Change-Id: I802c3d22a7934f0d84dcbead758bfcad9195e401
Android Build Merger (Role) [Tue, 28 May 2019 19:22:47 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913
Change-Id: I48d0148eb1a45e93105b3baf6a42ba91221fc402
Android Build Merger (Role) [Tue, 28 May 2019 19:22:45 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512
Change-Id: I1f9eb6a5010e8ffef7b7e0912b7f6ce81067ccec
Android Build Merger (Role) [Tue, 28 May 2019 19:22:44 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf
Change-Id: I040da3eb560786454a69d3230cf7d559a98c9818
Android Build Merger (Role) [Tue, 28 May 2019 19:22:42 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462
Change-Id: I5af312e49f6c6440ae31d8bb55d1ed3311a46e43
Android Build Merger (Role) [Tue, 28 May 2019 19:22:40 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9
Change-Id: Id63bf05a79287ec45942647075c715e858f915d1
Jakub Pawlowski [Fri, 24 May 2019 20:01:09 +0000 (22:01 +0200)]
DO NOT MERGE Send HCI Read Encryption Key properly
This patch fixes bad HCI command being send instead of Read Encryption
Key Size.
Bug:
124301137
Test: pair and connect with Bluetooth headset
Change-Id: If325ef2771ca1546ae58df7c684f66ae537b8573
Myles Watson [Fri, 10 May 2019 19:07:40 +0000 (12:07 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0 am:
6479bff4cf -s ours
am:
743f7856b2 -s ours
am skip reason: subject contains skip directive
Change-Id: Iff03c5de4fab55d3bc54812f776040464011ac9e
Myles Watson [Fri, 10 May 2019 19:07:00 +0000 (12:07 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3 am:
7316c97cd1 -s ours
am:
6d827a4be2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ice25049f5b4e398e21345d3f6f69088cd68389cb
Myles Watson [Fri, 10 May 2019 19:03:13 +0000 (12:03 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am:
3bf41c03e0
am:
6479bff4cf -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1
c0c3804acd is in history
Change-Id: I0e3438cb5090abcb65e4863ff725db2fe8b35f30
Myles Watson [Fri, 10 May 2019 19:01:54 +0000 (12:01 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
cd7bdf4cc3
am:
7316c97cd1 -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1
c0c3804acd is in history
Change-Id: If63f87a0300606a903bc8f7e9af6fb8e0ad708fd
Myles Watson [Fri, 10 May 2019 18:56:51 +0000 (11:56 -0700)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev
am:
3bf41c03e0
Change-Id: Iea733c12789b381728a66f9de7c60c9420072cf1
Myles Watson [Fri, 10 May 2019 18:56:27 +0000 (11:56 -0700)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
am:
cd7bdf4cc3
Change-Id: I3f1d66a7c9da0740c0086d061a9cfc7c8ce0909a
Myles Watson [Thu, 9 May 2019 20:59:21 +0000 (13:59 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev am:
c322f3baa3 am:
7642947735
am:
d7a673d47f
Change-Id: I92608bcb41ffaddddebb1e0c1469572fb93f4b24
Myles Watson [Thu, 9 May 2019 20:58:26 +0000 (13:58 -0700)]
[automerger skipped] [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05 am:
2cef3d79da am:
dbad5b2a65
am:
b4318e302a -s ours
am skip reason: subject contains skip directive
Change-Id: I5439bd2d0cdcf8546a48ca5327e0f598f8c85e61
TreeHugger Robot [Thu, 9 May 2019 20:20:23 +0000 (20:20 +0000)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev
Myles Watson [Thu, 9 May 2019 20:12:39 +0000 (13:12 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev am:
c322f3baa3
am:
7642947735
Change-Id: I5e720a69941ff5ce5873ed154fcd8fb6fde523e1
Myles Watson [Thu, 9 May 2019 20:11:31 +0000 (13:11 -0700)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05 am:
2cef3d79da
am:
dbad5b2a65
Change-Id: I14e32670ab2e0dbaa948585fe2952aecdb13b280
Myles Watson [Thu, 9 May 2019 19:33:12 +0000 (12:33 -0700)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev
am:
c322f3baa3
Change-Id: I6b0940b2f486f0b433e0fda5274b10fc3b2b082d
Myles Watson [Thu, 9 May 2019 19:32:16 +0000 (12:32 -0700)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05
am:
2cef3d79da
Change-Id: I6af0d17305a6fbede200e3ee0e1e951f0232ff01
Myles Watson [Thu, 9 May 2019 19:31:00 +0000 (12:31 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev
am:
bff76f0800 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic0c4e506c02980debe71e25fa373d5bad2863f63
Myles Watson [Thu, 9 May 2019 19:30:32 +0000 (12:30 -0700)]
[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
am:
c0c3804acd -s ours
am skip reason: subject contains skip directive
Change-Id: Ia75f800491c79738150fa89028fabbe2d1c22d18
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into nyc-mr2-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into cw-f-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into nyc-mr1-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into nyc-dr1-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into nyc-dev
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:47:49 +0000 (18:47 +0000)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev
TreeHugger Robot [Thu, 9 May 2019 18:47:28 +0000 (18:47 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into pi-dev
Martin Brabham [Wed, 8 May 2019 16:58:11 +0000 (09:58 -0700)]
[automerger skipped] Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am:
99a0259cf3 am:
dd2e11092a
am:
1a99efee01 -s ours
am skip reason: subject contains skip directive
Change-Id: Id031a291948c84874a9d70b87cfe4ed57f1ed389
Martin Brabham [Wed, 8 May 2019 16:45:37 +0000 (09:45 -0700)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am:
99a0259cf3
am:
dd2e11092a
Change-Id: I5dcb7baaf68e522a0604a30c53be5d61bf315a73
Martin Brabham [Wed, 8 May 2019 16:39:30 +0000 (09:39 -0700)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
am:
99a0259cf3
Change-Id: Ic593d9a4c421539181402c39860db5771a8f1417
TreeHugger Robot [Wed, 8 May 2019 16:30:02 +0000 (16:30 +0000)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
Ted Wang [Wed, 8 May 2019 04:59:25 +0000 (21:59 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am:
cd20f25a79 -s ours am:
d76a5a7532 -s ours
am:
5d37d19091 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
08202bdcbe is in history
Change-Id: I7df90c8eb729337eb6d6e4425214676a9d0dc32d
Ted Wang [Wed, 8 May 2019 04:26:09 +0000 (21:26 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am:
cd20f25a79 -s ours
am:
d76a5a7532 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
08202bdcbe is in history
Change-Id: Ic1064df1d0f2d24d74e030112040e4b53101e7ba
Ted Wang [Wed, 8 May 2019 04:06:54 +0000 (21:06 -0700)]
[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev
am:
cd20f25a79 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1
08202bdcbe is in history
Change-Id: I8465f167bb3054270c8ab3222835bca9096f8212
TreeHugger Robot [Wed, 8 May 2019 03:35:08 +0000 (03:35 +0000)]
Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev
Ted Wang [Tue, 7 May 2019 22:27:13 +0000 (15:27 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354 am:
ee88b904c5
am:
6e197e9332 -s ours
am skip reason: subject contains skip directive
Change-Id: I34a6387c4d3eb5eebe2a94b6ec84a409a6f20808
Ted Wang [Tue, 7 May 2019 22:14:26 +0000 (15:14 -0700)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00 am:
5c82fb9354
am:
ee88b904c5
Change-Id: I1aa9a18fd7e1ccdcc89227d732a7ab758d62ae18
Ted Wang [Tue, 7 May 2019 22:01:21 +0000 (15:01 -0700)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00
am:
5c82fb9354
Change-Id: Ia977c5381d95449adf2e20692c23dcd00c9b3fd9
Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]
DO NOT MERGE: osi: Offload mutex pointer to local scope
Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.
Bug:
117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a
Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]
DO NOT MERGE: osi: Offload mutex pointer to local scope
Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.
Bug:
117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a
Android Build Merger (Role) [Mon, 6 May 2019 05:57:02 +0000 (05:57 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00
Change-Id: I12681b184de3aaff511fcf29540b6cde73bc6ac2
Android Build Merger (Role) [Mon, 6 May 2019 05:56:59 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70
Change-Id: I91346a746ce3342fc02c6a8afa82ed1904b374d7
Android Build Merger (Role) [Mon, 6 May 2019 05:56:54 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041
Change-Id: I8f91d03ebd8ce528acf076443400daed71b261aa
Android Build Merger (Role) [Mon, 6 May 2019 05:56:49 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe
Change-Id: I854858463801fabb6b21bc6af67d794387c36b3e
Android Build Merger (Role) [Mon, 6 May 2019 05:56:45 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe
Change-Id: I79d94e8ba10a1f8e5f1657eaab36eacab4c6d0fb
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
Bug:
117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
Bug:
117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
(cherry picked from commit
1243f8da338dadfe2a3c281a08297b431402d41c)
Myles Watson [Wed, 1 May 2019 18:31:36 +0000 (18:31 +0000)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit
09894418589479875443037c45e596824da90928.
Bug:
79703832
Bug:
130553855
Reason for revert: Regression with cross-key pairing
Change-Id: Idb732736c250a8ed375cce4f7b27669542ea70e2
Merged-In: If8652936eb3b24b3d1b3fded0be200bb986b70e3
Myles Watson [Wed, 1 May 2019 18:32:19 +0000 (18:32 +0000)]
DO NOT MERGE Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit
dc14eb8ba01ee20dc44bcba7b3c0a17550e756fa.
Bug:
79703832
Bug:
130553855
Reason for revert: Regression with cross-key pairing
Change-Id: I2c8bf4f6c41f87bd6b7b217486260da4a084e4bd
Myles Watson [Wed, 1 May 2019 18:31:46 +0000 (18:31 +0000)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit
f3681c8616af4d052c410ba3e88747541a974bf5.
Bug:
79703832
Bug:
130553855
Reason for revert: Regression with cross-key pairing
Change-Id: If8652936eb3b24b3d1b3fded0be200bb986b70e3
Android Build Merger (Role) [Wed, 1 May 2019 18:28:23 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05
Change-Id: I7751a160ac79d810e5e8f2a545f7887ab2cfe756
Android Build Merger (Role) [Wed, 1 May 2019 18:28:22 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0
Change-Id: Ifc01741e99c7912c459ee9178c1c8533599df240
Android Build Merger (Role) [Wed, 1 May 2019 18:28:20 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
Change-Id: If67e79b47e46c5808dff364e9a51da247e2c82f3
Android Build Merger (Role) [Wed, 1 May 2019 18:28:18 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
Change-Id: Idd6c2e065049ae432ecc44069c4344c97e46d8de
Android Build Merger (Role) [Wed, 1 May 2019 18:28:16 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Change-Id: I1a5218347cd6039a1aa48f304a55e2cce6b5d179
Myles Watson [Wed, 1 May 2019 18:28:13 +0000 (18:28 +0000)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit
edd7e731edad067fe08b0623be6b2745bf81a445.
Bug:
79703832
Bug:
130553855
Reason for revert: Regression with cross-key pairing
Change-Id: I78f523b930d1433e39fc900d703f2317518a8b39
Jakub Pawlowski [Mon, 8 Apr 2019 13:03:09 +0000 (06:03 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
292fcf8612 -s ours am:
e8dea68f6a -s ours
am:
dc17388efd -s ours
am skip reason: subject contains skip directive
Change-Id: I368bf6dcf1599b50fce99a9c55fb25bc896996cb
Jakub Pawlowski [Mon, 8 Apr 2019 13:00:22 +0000 (06:00 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am:
292fcf8612 -s ours
am:
e8dea68f6a -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1
c0fb2a25f9 is in history
Change-Id: If68cf83db0a7388146f4e28a8433f8bd4c402e72
Jakub Pawlowski [Mon, 8 Apr 2019 12:55:18 +0000 (05:55 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am:
292fcf8612 -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1
c0fb2a25f9 is in history
Change-Id: I923523630e1e8530f23f3720611582353ffecff4
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128843052
Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111