OSDN Git Service
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 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
Jakub Pawlowski [Fri, 5 Apr 2019 23:25:51 +0000 (16:25 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328 am:
c07f304de8 am:
fc58eb3c8d
am:
97e9e1540a -s ours
am skip reason: subject contains skip directive
Change-Id: Ib1c23383e61d4faca8970cad71fa8f24dd2e354c
Jakub Pawlowski [Fri, 5 Apr 2019 23:23:05 +0000 (16:23 -0700)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328 am:
c07f304de8
am:
fc58eb3c8d
Change-Id: I346917706000054f0aee3bc3084f60e15b7a4f57
Jakub Pawlowski [Fri, 5 Apr 2019 23:03:40 +0000 (16:03 -0700)]
[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am:
054dcec1c9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib7be32bd6046f7fce608fc0bef9d812ab6341b2a
Jakub Pawlowski [Fri, 5 Apr 2019 21:27:01 +0000 (14:27 -0700)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328
am:
c07f304de8
Change-Id: I20eed1aeb29a3df15251033d02fd7d5d241a28dd
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:30 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328
Change-Id: Ia5e85f456ba202b1562b8f6fc2f3481f7a999691
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:23 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e
Change-Id: I6d433ec513e6f04b8e117a08a9ce5bebdd42d8d4
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:19 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d
Change-Id: Idf19ab0fdf1da993701a6b24d47fccc982f3e2ff
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:16 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68
Change-Id: I21c8af012049cbf87adc90f1e3e46f47baddbca5
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:13 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9
Change-Id: I2a44d852ccb88db0bf360ae094d240ca64e50a94
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
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
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
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
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
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
TreeHugger Robot [Wed, 27 Mar 2019 05:09:25 +0000 (05:09 +0000)]
Merge "DO NOT MERGE Log encryption key size" into pi-dev
Jakub Pawlowski [Tue, 26 Mar 2019 23:20:56 +0000 (16:20 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
049bf4ec4e -s ours am:
5237f6add3 -s ours
am:
6caf0b031f -s ours
am skip reason: subject contains skip directive
Change-Id: I2a7fe904c4d72a88fa0db1f3d9e55753f8f5aa01
Jakub Pawlowski [Tue, 26 Mar 2019 23:14:53 +0000 (16:14 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937 am:
1ecc29885a am:
262bb16a7e
am:
633bf7e310 -s ours
am skip reason: subject contains skip directive
Change-Id: I4cf14b1e4d53a53e553dfa31afc0a11b2e31dee1
Jakub Pawlowski [Tue, 26 Mar 2019 23:14:42 +0000 (16:14 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
049bf4ec4e -s ours
am:
5237f6add3 -s ours
am skip reason: change_id Id4b6b4e765628397a79e6806f45c2cd27acebd5b with SHA1
027532b367 is in history
Change-Id: I56780086be9ba71ee573956d0991824db7ebba0f
Jakub Pawlowski [Tue, 26 Mar 2019 23:14:08 +0000 (16:14 -0700)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937 am:
1ecc29885a
am:
262bb16a7e
Change-Id: Iebb2f610252f8cec64ea7003fd1955d30b7fcf79
Jakub Pawlowski [Tue, 26 Mar 2019 23:02:58 +0000 (16:02 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
am:
049bf4ec4e -s ours
am skip reason: change_id Id4b6b4e765628397a79e6806f45c2cd27acebd5b with SHA1
027532b367 is in history
Change-Id: I9f7f56c8620a99ce5f2a4bf0e33eb94cdac829a5
Jakub Pawlowski [Tue, 26 Mar 2019 22:26:23 +0000 (15:26 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
am:
e32d4aa7a4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ica0e4d762e9b9e50847c0403a1fd70724f9be020
Jakub Pawlowski [Tue, 26 Mar 2019 22:10:24 +0000 (15:10 -0700)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937
am:
1ecc29885a
Change-Id: I43f7d01e376f8260e1120d3a403c41f45eca5950
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Merged-In: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Jack He [Thu, 21 Mar 2019 00:51:09 +0000 (17:51 -0700)]
DO NOT MERGE Log encryption key size
* Log result from HCI_READ_ENCR_KEY_SIZE command
Bug:
124301137
Test: test drive with statsd
Change-Id: I776a3c357fcd75623fba241f150d1afb58aa23fb
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:05 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937
Change-Id: I028d493ce2aae117a28422b68df67dd424b28148
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:03 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2
Change-Id: I203993fecd15608d036b79ae9f1bcf1e6e5536b1
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:01 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e
Change-Id: Iebe131904b01492285eaaeaf6408b76037b2643e
Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:58 +0000 (18:29 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86
Change-Id: Ia0fb7cb6c331f4f30b4a2320fa52b66be425c74f
Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:56 +0000 (18:29 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367
Change-Id: I4fb660ac5ca288993e6f0643929eb1b1def1040c
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Martin Brabham [Mon, 25 Feb 2019 22:40:33 +0000 (14:40 -0800)]
[DO NOT MERGE] btif/osi: move I/O to OSI layer. disable for multi-user.
Two issues here.
One, read/write/modify/remove access to the checksum by the secondary user.
Two, Fail to access keystore with secondary user stack running (stack doesn't run as UID 1002)
Bug:
117993149
Test: atest net_test_btif net_test_bluetooth net_test_osi
Change-Id: I7af452e00a4f342f1c49006e86488b59195b70ce
Merged-In: I7af452e00a4f342f1c49006e86488b59195b70ce
Martin Brabham [Tue, 12 Feb 2019 19:23:39 +0000 (11:23 -0800)]
[DO NOT MERGE] Handle edge cases where input or hash/data could be null.
Bug: b/
117993149
Test: Manual; atest net_test_btif net_test_bluetooth
Change-Id: Ia91ea822ee2147b2a2d14bea250a708e8c10bae4
Merged-In: Ia91ea822ee2147b2a2d14bea250a708e8c10bae4
Greg Kaiser [Thu, 7 Feb 2019 16:40:11 +0000 (08:40 -0800)]
[DO NOT MERGE] btif: Avoid resource leak in error case
If our memory allocation fails, we make sure we close our file
before returning.
Bug: b/
117993149
Test: TreeHugger
Change-Id: I43b43d8b3d96e51a73bc8187ef614d02bbd31781
Merged-In: I43b43d8b3d96e51a73bc8187ef614d02bbd31781
Greg Kaiser [Thu, 7 Feb 2019 16:48:20 +0000 (08:48 -0800)]
[DO NOT MERGE] btif: Avoid a couple string copies
We pass a couple string arguments by const reference instead of
by copy.
Bug: b/
117993149
Test: TreeHugger
Change-Id: I01e476edf1f5e8c7b6fc88e0eb87ed3bbfca7a00
Merged-In: I01e476edf1f5e8c7b6fc88e0eb87ed3bbfca7a00
Greg Kaiser [Thu, 7 Feb 2019 16:54:01 +0000 (08:54 -0800)]
[DO NOT MERGE] btif: Lighter weight file existence check
We switch from the heavier weight fopen() to using access() to
check for file existence and readability. This avoids some of
the file opening overhead we don't need here.
Bug: b/
117993149
Test: TreeHugger
Change-Id: Ib47b24e9d96803b7822535f9f566aa7818b38953
Merged-In: Ib47b24e9d96803b7822535f9f566aa7818b38953
Martin Brabham [Fri, 1 Feb 2019 21:42:58 +0000 (13:42 -0800)]
[DO NOT MERGE] Implement key attestation using AndroidKeystore.
Store SHA256 hash of the config file in an encrypted file that has been encrypted using the Android Keystore API.
Bug: b/
117993149
Test: Manual
Change-Id: I26de9ea05f515d6643a83d11628490fb49e10743
Merged-In: I26de9ea05f515d6643a83d11628490fb49e10743
TreeHugger Robot [Sat, 9 Mar 2019 03:09:41 +0000 (03:09 +0000)]
Merge "DO NOT MERGE: Use a weak pointer to deliver updates to AVRCP devices." into pi-dev
Ajay Panicker [Fri, 14 Dec 2018 22:55:02 +0000 (14:55 -0800)]
DO NOT MERGE: Use a weak pointer to deliver updates to AVRCP devices.
If a device disconnects right before a update message gets queued, the
device becomes null and there is a crash when the callback for the
update executes on the disconnected device. This patch switches the
device reference from being Unretained to using a weak pointer so that
the callback just doesn't execute if the device is disconnected.
Bug:
120431125
Bug:
120445479
Test: Use the same test as b/
120477414 as that bug causes a disconnect
at the same time as a media update.
Change-Id: I1dcc08e5c9866106e7ec0dad52505e34b42da600
Hansong Zhang [Fri, 8 Mar 2019 00:39:34 +0000 (16:39 -0800)]
[automerger skipped] [automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2 am:
ec1eca1dfb am:
294210a1a2
am:
aa03b49791 -s ours
am skip reason: subject contains skip directive
Change-Id: I640047c7412d16eb5e48e15027eec92aeea13f5e
Hansong Zhang [Fri, 8 Mar 2019 00:09:35 +0000 (16:09 -0800)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2 am:
ec1eca1dfb
am:
294210a1a2
Change-Id: I770c49c0620e4267d2134abbecc8b55193149227
Hansong Zhang [Thu, 7 Mar 2019 23:22:20 +0000 (15:22 -0800)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2
am:
ec1eca1dfb
Change-Id: I8d891af970d9eea45384eff2967544adb6ffafc7
TreeHugger Robot [Thu, 7 Mar 2019 23:04:58 +0000 (23:04 +0000)]
Merge "DO NOT MERGE Fix length for L2CAP config type EXT FLOW" into nyc-dev
Jakub Pawlowski [Tue, 5 Mar 2019 11:10:02 +0000 (12:10 +0100)]
Clear the link key when releasing security records
Test: compilation
Bug:
127479372
Change-Id: Ia571a2048fa5ca85c45b03b39d398e480aadb55a
Merged-In: Ia571a2048fa5ca85c45b03b39d398e480aadb55a
(cherry picked from commit
acb0a7eb17ec327b46071bc482c8b9687b730fdc)
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:47 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2
Change-Id: I5f0ad541fa702233322b96e5dd5c9d53233dea94
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:45 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce
Change-Id: I6e56a6c02e5d7a3e23832c8e24550ae626a4dc6a
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:43 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c
Change-Id: I747585195e3cf9137449dc777b64174a4a93c1f3
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:42 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178
Change-Id: Ie35b3f093063898bc9d8cab84d221194f1ca007b
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:38 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe
Change-Id: I24f0d31be7582e28ba9b96d836cd85bcf7f3ef4c
Hansong Zhang [Thu, 7 Mar 2019 18:50:04 +0000 (10:50 -0800)]
DO NOT MERGE Fix length for L2CAP config type EXT FLOW
Bug:
119870451
Test: POC
Change-Id: I11041dd03caad5569e930ff36b50fc9c2719c57f
OSDN Git Service
