OSDN Git Service
Andre Eisenbach [Mon, 16 Apr 2018 18:00:03 +0000 (11:00 -0700)]
[automerger skipped] Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev am:
a712452923 am:
1c9274be48 am:
0cefb24d42 -s ours am:
917ce425d4
am:
eb1e5c0089 -s ours
Change-Id: I62addd0645dff61a4502905798d9f234d57c440a
Andre Eisenbach [Mon, 16 Apr 2018 17:40:12 +0000 (10:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev am:
a712452923 am:
1c9274be48 am:
0cefb24d42 -s ours
am:
917ce425d4
Change-Id: I4ddd815134e20c811cab9607ebee96573e19a1a3
Andre Eisenbach [Mon, 16 Apr 2018 17:03:43 +0000 (10:03 -0700)]
[automerger skipped] Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev am:
a712452923 am:
1c9274be48
am:
0cefb24d42 -s ours
Change-Id: Ie94b8a293a25e5cea84845fd68ca6df4962ab04c
Andre Eisenbach [Mon, 16 Apr 2018 16:59:16 +0000 (09:59 -0700)]
Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev am:
a712452923
am:
1c9274be48
Change-Id: Ida7f1395569973f1acf2a01b61da6fa624005081
Andre Eisenbach [Mon, 16 Apr 2018 16:56:15 +0000 (09:56 -0700)]
Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev
am:
a712452923
Change-Id: I959b5d799ad27ba1b03ab578fbdfecbc0edb5cd6
Andre Eisenbach [Mon, 16 Apr 2018 16:49:25 +0000 (16:49 +0000)]
Merge "DO NOT MERGE SMP: Validate remote elliptic curve points" into oc-dev
Ian Pedowitz [Sun, 15 Apr 2018 03:13:25 +0000 (20:13 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev am:
02e7972fff am:
cce92c4ef6 am:
1c8b37f57f am:
8b71f16aa7
am:
f0ad259055
Change-Id: Ib35620d012568d47c50f4c890652f8ee9550a9c0
Ian Pedowitz [Sun, 15 Apr 2018 02:53:09 +0000 (19:53 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev am:
02e7972fff am:
cce92c4ef6 am:
1c8b37f57f
am:
8b71f16aa7
Change-Id: Ib547f34a94a1832f999bb1be5fc27f328d2d176e
Ajay Panicker [Sat, 14 Apr 2018 23:24:31 +0000 (16:24 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev am:
3752a74245 am:
bea60140d5 am:
6e1f7441f7 am:
1b595cb80c
am:
2df73b87cf
Change-Id: I337ddcdb6e0955fcd8219d2218b4bc557f8217e3
Ian Pedowitz [Sat, 14 Apr 2018 22:55:23 +0000 (15:55 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev am:
02e7972fff am:
cce92c4ef6
am:
1c8b37f57f
Change-Id: I3338d7c94900a70a7066f5cc410ad0f002fc2c65
Ian Pedowitz [Sat, 14 Apr 2018 22:40:13 +0000 (15:40 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev am:
02e7972fff
am:
cce92c4ef6
Change-Id: Ieb97aa2df69ef785e69c2b756d56a8da54b6eebf
Ian Pedowitz [Fri, 13 Apr 2018 21:43:49 +0000 (14:43 -0700)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev
am:
02e7972fff
Change-Id: I48f85ba534045591f7ae5ac636d40b0ad48e8778
Ajay Panicker [Fri, 13 Apr 2018 21:34:08 +0000 (14:34 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev am:
3752a74245 am:
bea60140d5 am:
6e1f7441f7
am:
1b595cb80c
Change-Id: Ib7e007ba5430a6962228dff9df4bb3f77f8e1df2
TreeHugger Robot [Fri, 13 Apr 2018 21:31:06 +0000 (21:31 +0000)]
Merge "Remove bsears/ijpedowitz from system/bt OWNERS" into oc-dev
Ajay Panicker [Fri, 13 Apr 2018 20:59:09 +0000 (13:59 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev am:
3752a74245 am:
bea60140d5
am:
6e1f7441f7
Change-Id: Ib5a9aecfeaa87431b57f2b2616c4548395bd4419
Ajay Panicker [Fri, 13 Apr 2018 20:48:41 +0000 (13:48 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev am:
3752a74245
am:
bea60140d5
Change-Id: I2dab6069525413f1d6365c7ce7affe8587afcbe4
Hansong Zhang [Fri, 13 Apr 2018 20:41:38 +0000 (13:41 -0700)]
Merge "Fix OOB read in process_l2cap_cmd" into pi-dev am:
e3d595f2d3
am:
4ce8082d46
Change-Id: Ifb72618cba4adde9b0a3557555e8557b8d04f1ec
Ajay Panicker [Fri, 13 Apr 2018 20:41:05 +0000 (13:41 -0700)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev
am:
3752a74245
Change-Id: Ife4fbd0a17a6e9b861f4a3c8ee202e7d176b0825
Hansong Zhang [Fri, 13 Apr 2018 20:30:12 +0000 (13:30 -0700)]
Merge "Fix OOB read in process_l2cap_cmd" into pi-dev
am:
e3d595f2d3
Change-Id: If55dcf5f859b553e3497bcd98a069d440c2c0292
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into oc-dev
* changes:
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9 am:
66cf5dda11 skipped:
c2dff60c3a
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9 am:
66cf5dda11
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee
DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
TreeHugger Robot [Fri, 13 Apr 2018 20:00:11 +0000 (20:00 +0000)]
Merge "Fix OOB read in process_l2cap_cmd" into pi-dev
Hansong Zhang [Fri, 13 Apr 2018 19:52:47 +0000 (12:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev am:
75dea4c637 am:
c39740079b am:
1bd5790f72 -s ours am:
e0355b229b
am:
e7328b349e -s ours
Change-Id: I4707ac8480e21c577de07b83e98fd08b367047f6
Hansong Zhang [Fri, 13 Apr 2018 19:52:31 +0000 (12:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
2714b8175f am:
e325dab311 am:
dfa7917f71 -s ours am:
5fa2274d3b
am:
8188e7f1d8 -s ours
Change-Id: I5ffcab9d56fdfd320599c65cdb7febe5857f9a4e
Hansong Zhang [Fri, 13 Apr 2018 19:52:16 +0000 (12:52 -0700)]
[automerger skipped] Merge "DO NOT MERGE Initialize local variable in gatts_process_read_by_type_req" into oc-mr1-dev am:
7bee4b48be -s ours am:
b8d562a294
am:
9ef56e5d5b -s ours
Change-Id: Iad16dce676688c21d510d2cfb59839b6514fe909
Hansong Zhang [Fri, 13 Apr 2018 19:51:59 +0000 (12:51 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into oc-dev am:
d9f2106a62 am:
1627df6736 am:
c45fb1ea3a am:
18ff936eed
am:
d3dde47fd5
Change-Id: Id81c233e87b1700f711886fe6e149bee6d2c745b
Hansong Zhang [Fri, 13 Apr 2018 19:51:26 +0000 (12:51 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into oc-dev am:
853d6267e1 am:
e6057078f7 am:
3e2c5ef3d4 am:
a9614ccac3
am:
e4ed9840f7
Change-Id: I07dac8ded8be7433cc762dd604badf502a0fffd2
Hansong Zhang [Fri, 13 Apr 2018 19:50:56 +0000 (12:50 -0700)]
Merge "Add bounds check for BNEP_Write" into pi-dev am:
6b2d02b7ea
am:
1ff4d8dc91
Change-Id: If09cccbb0a96fab203338499b80f817138fb861f
Hansong Zhang [Fri, 13 Apr 2018 19:50:13 +0000 (12:50 -0700)]
Merge "Initialize local variable in gatts_process_read_by_type_req" into pi-dev am:
4bd1bf3be8
am:
4b6e9a0b3f
Change-Id: I02153001e626b8884719d67d9537dc7f6cf7a438
Hansong Zhang [Fri, 13 Apr 2018 19:49:10 +0000 (12:49 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev am:
ca2db5620d am:
05a3ab6e80 am:
79a34c4d18 am:
86fd602084
am:
c5308425b2
Change-Id: Ifdc4f53579bc9b76efb54432fb012ab85aa51ac5
Hansong Zhang [Fri, 13 Apr 2018 19:43:31 +0000 (12:43 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac am:
167165f72a am:
da1f87776d am:
8634a90de6 -s ours am:
edec95f69b
am:
24d167650c -s ours
Change-Id: I38a1fafb9dcbf69a96ecc5257e7b81fda43100b4
Hansong Zhang [Fri, 13 Apr 2018 19:16:36 +0000 (12:16 -0700)]
[automerger skipped] Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev am:
75dea4c637 am:
c39740079b am:
1bd5790f72 -s ours
am:
e0355b229b
Change-Id: I5a3b37ce4db32d45ebdc1fd6056463ea5b370543
Hansong Zhang [Fri, 13 Apr 2018 19:15:38 +0000 (12:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
2714b8175f am:
e325dab311 am:
dfa7917f71 -s ours
am:
5fa2274d3b
Change-Id: Idb3289591e808ba17d03c164a0e81d5374bf13fe
Hansong Zhang [Fri, 13 Apr 2018 19:15:10 +0000 (12:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE Initialize local variable in gatts_process_read_by_type_req" into oc-mr1-dev am:
7bee4b48be -s ours
am:
b8d562a294
Change-Id: I39ddc92c36258f1d055166afb0274529053e2521
Hansong Zhang [Fri, 13 Apr 2018 19:14:44 +0000 (12:14 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into oc-dev am:
d9f2106a62 am:
1627df6736 am:
c45fb1ea3a
am:
18ff936eed
Change-Id: I499b7a03f32a83ba11753ed0a1826d424c85667f
Hansong Zhang [Fri, 13 Apr 2018 19:14:00 +0000 (12:14 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into oc-dev am:
853d6267e1 am:
e6057078f7 am:
3e2c5ef3d4
am:
a9614ccac3
Change-Id: Iab086badebd2342b2096e2ac79d18fbc05989e85
Hansong Zhang [Fri, 13 Apr 2018 19:12:54 +0000 (12:12 -0700)]
Merge "Add bounds check for BNEP_Write" into pi-dev
am:
6b2d02b7ea
Change-Id: I9d8398b000f56abc6f0d9a6707ffcdb701a56002
Hansong Zhang [Fri, 13 Apr 2018 19:09:35 +0000 (12:09 -0700)]
Merge "Initialize local variable in gatts_process_read_by_type_req" into pi-dev
am:
4bd1bf3be8
Change-Id: I46b9c881b6f281445d001d876314e416b28492eb
Ian Pedowitz [Fri, 13 Apr 2018 18:58:08 +0000 (11:58 -0700)]
Remove bsears/ijpedowitz from system/bt OWNERS
We now have Build Cop Override
Fixes:
78017465
Test: N/A
Change-Id: I7feff1c76927a2a454cbe33c99a5a40fc8d96ee6
Hansong Zhang [Fri, 13 Apr 2018 18:57:57 +0000 (11:57 -0700)]
[automerger skipped] Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev am:
75dea4c637 am:
c39740079b
am:
1bd5790f72 -s ours
Change-Id: I98e64840db2528f5bd1240a97f974612466a3f96
Hansong Zhang [Fri, 13 Apr 2018 18:57:42 +0000 (11:57 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
2714b8175f am:
e325dab311
am:
dfa7917f71 -s ours
Change-Id: Ia7930985dc382c8d9533af4c16a5329f611d0d0c
Hansong Zhang [Fri, 13 Apr 2018 18:56:22 +0000 (11:56 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev am:
ca2db5620d am:
05a3ab6e80 am:
79a34c4d18
am:
86fd602084
Change-Id: I1ab5442fdc8a96e950488061a9a1e0de0815d830
Hansong Zhang [Fri, 13 Apr 2018 18:52:06 +0000 (11:52 -0700)]
Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev am:
75dea4c637
am:
c39740079b
Change-Id: Id127181f5dde16c0121fe4b307ecca9f69ad48ca
Hansong Zhang [Fri, 13 Apr 2018 18:51:44 +0000 (11:51 -0700)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
2714b8175f
am:
e325dab311
Change-Id: Id806df37d02288e4062bdfc29a402e4933a7cfbc
Hansong Zhang [Fri, 13 Apr 2018 18:47:35 +0000 (11:47 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac am:
167165f72a am:
da1f87776d am:
8634a90de6 -s ours
am:
edec95f69b
Change-Id: I4c90cbdf39d9082d0d63cbeba65ad43737b5dbea
Hansong Zhang [Fri, 13 Apr 2018 18:46:40 +0000 (11:46 -0700)]
Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev
am:
75dea4c637
Change-Id: I79386fb3e152492d31e2cee4181cd168b9c2cccf
Hansong Zhang [Fri, 13 Apr 2018 18:46:17 +0000 (11:46 -0700)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev
am:
2714b8175f
Change-Id: I6f98b5f541a6466ecdf166e199e310bfc012170d
Hansong Zhang [Fri, 13 Apr 2018 18:39:30 +0000 (11:39 -0700)]
[automerger skipped] Merge "DO NOT MERGE Initialize local variable in gatts_process_read_by_type_req" into oc-mr1-dev
am:
7bee4b48be -s ours
Change-Id: I4065b8e2dbc73e84633b0812cbda411c76740aff
Hansong Zhang [Fri, 13 Apr 2018 18:39:18 +0000 (11:39 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into oc-dev am:
d9f2106a62 am:
1627df6736
am:
c45fb1ea3a
Change-Id: Ica788159063524b5704aeac9a8d9694451fd63be
Hansong Zhang [Fri, 13 Apr 2018 18:38:48 +0000 (11:38 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into oc-dev am:
853d6267e1 am:
e6057078f7
am:
3e2c5ef3d4
Change-Id: I5fadd5a2450b39fceba5d6032179e89528635ec6
TreeHugger Robot [Fri, 13 Apr 2018 18:34:52 +0000 (18:34 +0000)]
Merge "Add bounds check for BNEP_Write" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 18:34:30 +0000 (18:34 +0000)]
Merge "Initialize local variable in gatts_process_read_by_type_req" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 18:34:28 +0000 (18:34 +0000)]
Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc-dev
TreeHugger Robot [Fri, 13 Apr 2018 18:34:12 +0000 (18:34 +0000)]
Merge "DO NOT MERGE Initialize local variable in gatts_process_read_by_type_req" into oc-mr1-dev
TreeHugger Robot [Fri, 13 Apr 2018 18:33:51 +0000 (18:33 +0000)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev
Hansong Zhang [Fri, 13 Apr 2018 18:33:23 +0000 (11:33 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into oc-dev am:
d9f2106a62
am:
1627df6736
Change-Id: Iabb157ee2d4fafc82d883f5912762db9d58dc89c
Hansong Zhang [Fri, 13 Apr 2018 18:32:42 +0000 (11:32 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into oc-dev am:
853d6267e1
am:
e6057078f7
Change-Id: I65f3977ee433e1d6709144d7d8b3091804135c3c
Hansong Zhang [Fri, 13 Apr 2018 18:27:14 +0000 (11:27 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into oc-dev
am:
d9f2106a62
Change-Id: Iaaf01c30e63503ff1eb4769db1ae092717d3f23f
Hansong Zhang [Fri, 13 Apr 2018 18:26:45 +0000 (11:26 -0700)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into oc-dev
am:
853d6267e1
Change-Id: I0d52f9bd522c670fb363e5cae99d013c8fc7ad02
Hansong Zhang [Wed, 11 Apr 2018 23:59:55 +0000 (16:59 -0700)]
Fix OOB read in process_l2cap_cmd
Bug:
74202041
Bug:
74196706
Bug:
74201143
Test: manual
Change-Id: Ic25f7f3777d0375f76cc91e4d129b1636f1c388d
TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8 am:
fa184a2b3b am:
d200b0fe25 am:
6f4c3dc7e6 skipped:
ce6180d204
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8 am:
fa184a2b3b am:
d200b0fe25 am:
6f4c3dc7e6
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8 am:
fa184a2b3b am:
d200b0fe25
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8 am:
fa184a2b3b
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78
DO NOT MERGE Fix OOB read in process_l2cap_cmd
TreeHugger Robot [Fri, 13 Apr 2018 18:13:04 +0000 (18:13 +0000)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24 am:
44f3e1f626 am:
8a8b10746b am:
943480ce6f skipped:
205eb14edd
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24 am:
44f3e1f626 am:
8a8b10746b am:
943480ce6f
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24 am:
44f3e1f626 am:
8a8b10746b
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24 am:
44f3e1f626
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24
DO NOT MERGE Fix OOB read in process_l2cap_cmd
Hansong Zhang [Fri, 13 Apr 2018 17:46:21 +0000 (10:46 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev am:
ca2db5620d am:
05a3ab6e80
am:
79a34c4d18
Change-Id: I6090948de2e63f35f81c5705889c0c81ac536350
Hansong Zhang [Fri, 13 Apr 2018 17:45:51 +0000 (10:45 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac am:
167165f72a am:
da1f87776d
am:
8634a90de6 -s ours
Change-Id: Ie55d6956623496dddc558a1bf87758b183a83e05
Hansong Zhang [Fri, 13 Apr 2018 17:38:26 +0000 (10:38 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev am:
ca2db5620d
am:
05a3ab6e80
Change-Id: I2e0718c75916c152eddee35c3b3a354f2fa9fb66
Hansong Zhang [Fri, 13 Apr 2018 17:38:00 +0000 (10:38 -0700)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac am:
167165f72a
am:
da1f87776d
Change-Id: I9a2e670b407f2fff7db97e3b3584046c4238aeb5
Hansong Zhang [Fri, 13 Apr 2018 17:32:01 +0000 (10:32 -0700)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev
am:
ca2db5620d
Change-Id: I1965625083c5f2085d4fccc75b21bf3e42c7ed9b
Hansong Zhang [Fri, 13 Apr 2018 17:31:28 +0000 (10:31 -0700)]
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
769aeaaf44 am:
43f68c1ebe am:
b4cc558dd1 am:
b132411206 skipped:
008dd0e5ac
am:
167165f72a
Change-Id: I1cd29964585f19318cded3a3342462bb5e6e19a1
TreeHugger Robot [Fri, 13 Apr 2018 17:14:22 +0000 (17:14 +0000)]
Merge changes from topic "am-
95b770cf-713e-4c26-a12d-
ca284eb0fbd7" into oc-dev
* changes:
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf am:
d5945f871b am:
a71087b592 skipped:
b1997290c7
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf am:
d5945f871b am:
a71087b592
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf am:
d5945f871b
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef am:
e7b400a3bf
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442 am:
860b821bef
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1 skipped:
9197ada442
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20 am:
611c4c57f1
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e am:
55e9f35d20
[automerger] DO NOT MERGE Add bounds check for BNEP_Write am:
5eaf3a642e
DO NOT MERGE Add bounds check for BNEP_Write
Hansong Zhang [Thu, 12 Apr 2018 22:50:28 +0000 (15:50 -0700)]
DO NOT MERGE Fix OOB read in process_l2cap_cmd
Bug:
74202041
Bug:
74196706
Bug:
74201143
Test: manual
Change-Id: Ic25f7f3777d0375f76cc91e4d129b1636f1c388d
Hansong Zhang [Wed, 11 Apr 2018 23:04:51 +0000 (16:04 -0700)]
Add bounds check for BNEP_Write
Bug:
74947856
Test: manual
Change-Id: If5db8c6b6e509a330ae74808fc3f0ffac137af14
Hansong Zhang [Thu, 12 Apr 2018 18:45:03 +0000 (11:45 -0700)]
Initialize local variable in gatts_process_read_by_type_req
Bug:
73125709
Test: manual
Change-Id: Iac13d92c987e5bed4376ec994bb2a60cedf6c5db
Sunny Kapdi [Fri, 13 Apr 2018 02:41:49 +0000 (19:41 -0700)]
A2DP Offload: Fix the default LDAC bitrate am:
109a6beee6 am:
c3804ed4a8
am:
fda2feadc1
Change-Id: I699fc07bb890d9b3d5742a36cba074e5453ceda3
Hansong Zhang [Thu, 12 Apr 2018 18:58:49 +0000 (11:58 -0700)]
DO NOT MERGE Initialize local variable in gatts_process_read_by_type_req
Bug:
73125709
Test: manual
Change-Id: I8b3346f605e0820385ea5ed7401bbee664fd15aa
Sunny Kapdi [Fri, 13 Apr 2018 01:30:52 +0000 (18:30 -0700)]
A2DP Offload: Fix the default LDAC bitrate am:
109a6beee6
am:
c3804ed4a8
Change-Id: I63ae77a6ef3688e66677b5e8be2faebe322bc5e3
Sunny Kapdi [Fri, 13 Apr 2018 01:15:12 +0000 (18:15 -0700)]
A2DP Offload: Fix the default LDAC bitrate
am:
109a6beee6
Change-Id: I2e5b7ec7679a5650c84875d770b63f0e5a22ca6b
Stanley Tng [Fri, 13 Apr 2018 00:32:16 +0000 (17:32 -0700)]
Pass new LE CoC min_ce/max_ce parameters to native stack am:
4c30c11d72
am:
527418b995
Change-Id: Ieaa568d4eaf52bde191d5d898f66b620f0a2ff16
Android Build Merger (Role) [Thu, 12 Apr 2018 23:59:44 +0000 (23:59 +0000)]
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9 am:
66cf5dda11 skipped:
c2dff60c3a
Change-Id: Id15c8947c28a7043a18b9d05e225dab9bab94660
Android Build Merger (Role) [Thu, 12 Apr 2018 23:59:42 +0000 (23:59 +0000)]
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9 am:
66cf5dda11
Change-Id: Ic7d932ba006ebaf2d77be88752f69c71bbefb37c
Android Build Merger (Role) [Thu, 12 Apr 2018 23:59:41 +0000 (23:59 +0000)]
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9 skipped:
72eb87a7c9
Change-Id: I714d325360f32887ce029b8250875eda79ab1c90
Android Build Merger (Role) [Thu, 12 Apr 2018 23:58:53 +0000 (23:58 +0000)]
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee am:
049e0c62c9
Change-Id: I5b4b55fb8d0049cf9441940da12c30737a0d4f8e
Android Build Merger (Role) [Thu, 12 Apr 2018 23:58:51 +0000 (23:58 +0000)]
[automerger] DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ am:
a75ccdc7ee
Change-Id: I3e632c0dd3d5552a0e06f85adeeec91670aa00c4
Ajay Panicker [Thu, 12 Apr 2018 23:50:06 +0000 (16:50 -0700)]
DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
Bug:
74121659
Test: Compiles
Change-Id: Ib29dd50cee9decda2d73bb79b84215ea4c6ead75
Stanley Tng [Thu, 12 Apr 2018 23:07:23 +0000 (16:07 -0700)]
Pass new LE CoC min_ce/max_ce parameters to native stack
am:
4c30c11d72
Change-Id: I0c9ba087b15e8a1cfc9e6d6a53d7bdf7ad0cf0e5
Android Build Merger (Role) [Thu, 12 Apr 2018 23:05:06 +0000 (23:05 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8 am:
fa184a2b3b am:
d200b0fe25 am:
6f4c3dc7e6 skipped:
ce6180d204
Change-Id: I3b79e87b50053d1237bff2d34fbd1a751e9f95fb
Android Build Merger (Role) [Thu, 12 Apr 2018 23:05:05 +0000 (23:05 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8 am:
fa184a2b3b am:
d200b0fe25 am:
6f4c3dc7e6
Change-Id: I2af9ebaf746633fa45daaf92e43934849d335b9a
Android Build Merger (Role) [Thu, 12 Apr 2018 23:05:04 +0000 (23:05 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8 am:
fa184a2b3b am:
d200b0fe25
Change-Id: Iefc5a7c9aeabf522e96c99022b5ad971cc12ede6
Android Build Merger (Role) [Thu, 12 Apr 2018 23:05:02 +0000 (23:05 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8 am:
fa184a2b3b
Change-Id: Ie8be581f8a8c416008784479150e356540a11126
Android Build Merger (Role) [Thu, 12 Apr 2018 23:05:01 +0000 (23:05 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f am:
fdcc979af8
Change-Id: Ib71c5614b6e9771f9fe6bcd069ca6312a956b241
Android Build Merger (Role) [Thu, 12 Apr 2018 23:05:00 +0000 (23:05 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744 skipped:
85d60d236f
Change-Id: Ifdee9a139c36cf21c62c0332aa6fea731a8da526
Android Build Merger (Role) [Thu, 12 Apr 2018 23:04:59 +0000 (23:04 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20 am:
95eed5f744
Change-Id: Idd62c798d03219b2dbb54e89942b2c89d1091a24
Android Build Merger (Role) [Thu, 12 Apr 2018 23:04:57 +0000 (23:04 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78 am:
8c01980d20
Change-Id: I4a6bcdd9ed82515e64e6d1b5421dd1bea8570f40
Android Build Merger (Role) [Thu, 12 Apr 2018 23:04:56 +0000 (23:04 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
8c2b087c78
Change-Id: I85ab7eacfae89ad824845707f34b1f15913fbff0
Hansong Zhang [Thu, 12 Apr 2018 23:01:19 +0000 (16:01 -0700)]
DO NOT MERGE Fix OOB read in process_l2cap_cmd
Bug:
74202041
Bug:
74196706
Bug:
74201143
Test: manual
Change-Id: Ic25f7f3777d0375f76cc91e4d129b1636f1c388d
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:57 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24 am:
44f3e1f626 am:
8a8b10746b am:
943480ce6f skipped:
205eb14edd
Change-Id: I5d67820761fe4200e2a6e380c54250760bad1918
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:55 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24 am:
44f3e1f626 am:
8a8b10746b am:
943480ce6f
Change-Id: Ie319e5609bd4f8632ae12962fa04e0b19351b2cb
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:54 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24 am:
44f3e1f626 am:
8a8b10746b
Change-Id: Ib9b2c3f4ccf57ac6f98ef92c7e4697ddc5e3a8c2
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:52 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24 am:
44f3e1f626
Change-Id: Iaf99e15b6a9b10cc463fe924ae38962ba52bbe9c
Android Build Merger (Role) [Thu, 12 Apr 2018 23:01:50 +0000 (23:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
1bbea25a24
Change-Id: I27a10e02807359d9fe4042098c99b2a1af2c015e
Hansong Zhang [Thu, 12 Apr 2018 23:01:19 +0000 (16:01 -0700)]
DO NOT MERGE Fix OOB read in process_l2cap_cmd
Bug:
74202041
Bug:
74196706
Bug:
74201143
Test: manual
Change-Id: Ic25f7f3777d0375f76cc91e4d129b1636f1c388d
Sunny Kapdi [Fri, 23 Mar 2018 06:54:40 +0000 (23:54 -0700)]
A2DP Offload: Fix the default LDAC bitrate
Use LDAC ABR as default option in A2DP Offload mode.
Bug:
77879487
Test: Manual
Change-Id: Iec76691f8a83cd47aa7bf38efc6554139a59bb89
OSDN Git Service
