OSDN Git Service
edheyl [Wed, 18 Apr 2018 04:04:08 +0000 (04:04 +0000)]
Revert "Fix check for device lookup in map"
This reverts commit
149acbcbec1ebd600fcd7e3fc4512e8f29451c1f.
Reason for revert: build breakage, lack of response
Change-Id: I053b718c670366d80d240a2f66b599e9d5740abc
Ajay Panicker [Tue, 17 Apr 2018 21:15:30 +0000 (14:15 -0700)]
Fix check for device lookup in map
Bug:
78134184
Test: Run host native test net_test_avrcp
Change-Id: I57dd0040aa0e97f623cff97a28dc98e196414559
Jakub Pawlowski [Mon, 16 Apr 2018 14:55:06 +0000 (07:55 -0700)]
GATT: make last service end group handle equal to 0xFFFF
ESR06 (errata 4065) added sentence:
"The End Group Handle of the last service in a device can be 0xFFFF."
It talks about last service, not last primary service. Right now,
secondary service added after last primary service will result in in
last primary service being corrupted - descriptor added to last
characteristic, and some characteristics added.
Bug:
78107486
Change-Id: I6a146fce2c946cdff176ff79f147830e29d3b807
(cherry picked from
4c6007cfc42efbb7f6fb9bd1dc6c609f68ccd9a6)
TreeHugger Robot [Tue, 17 Apr 2018 03:30:31 +0000 (03:30 +0000)]
Merge "A2DP Offload: Handle init/deinit as part of start/end session" into pi-dev
Calin Juravle [Tue, 17 Apr 2018 01:10:50 +0000 (18:10 -0700)]
[automerger skipped] Merge "DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve points"" into oc-dev am:
94f279c8f4 am:
ae7de28fbe
am:
c6bc5705c0 -s ours
Change-Id: I1859c114ef6509f6d49032b07776450c7b932021
Calin Juravle [Tue, 17 Apr 2018 01:06:24 +0000 (18:06 -0700)]
Merge "DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve points"" into oc-dev am:
94f279c8f4
am:
ae7de28fbe
Change-Id: I0dcfcbb28e759d18bfb6eedc83a7fde04fbdf796
Calin Juravle [Tue, 17 Apr 2018 01:01:54 +0000 (18:01 -0700)]
Merge "DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve points"" into oc-dev
am:
94f279c8f4
Change-Id: I824ee80b3f0a8331d3f712ff313be1fdd93b77b7
Calin Juravle [Tue, 17 Apr 2018 00:54:05 +0000 (00:54 +0000)]
Merge "DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve points"" into oc-dev
Calin Juravle [Mon, 16 Apr 2018 23:57:34 +0000 (23:57 +0000)]
DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve points"
This reverts commit
e11ebfc21963ae905d58c034310efeca0e7cd2ee.
Reason for revert: breaks oc-mr1 build
BUG:
72377774
Change-Id: If14987041ba6b68ca00170b53b3942725615ff8d
Satish kumar sugasi [Tue, 3 Apr 2018 19:09:41 +0000 (12:09 -0700)]
A2DP Offload: Handle init/deinit as part of start/end session
Bug:
77289942
Test: Manual
Change-Id: I5b7ca6e485788d69f574bb74d2ef423507b183ff
Merged-In: I5b7ca6e485788d69f574bb74d2ef423507b183ff
(cherry picked from commit
86c58a09b82420967998a3f78ed7c770b0331c91)
TreeHugger Robot [Mon, 16 Apr 2018 22:13:09 +0000 (22:13 +0000)]
Merge "A2DP Offload: Fix the default LDAC bitrate" into pi-dev
Andre Eisenbach [Mon, 16 Apr 2018 20:53:42 +0000 (13:53 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852 am:
b86ae24aef am:
8c86c0c1da am:
a4755cf297 am:
cbf0dca767 skipped:
775ea97ce3 am:
1077237837 am:
32b5917cd2
am:
10ba01bbef -s ours
Change-Id: Iabfe5f0b668032fb9f5b083a2544a2c856938722
Andre Eisenbach [Mon, 16 Apr 2018 20:53:26 +0000 (13:53 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8 am:
502686433c am:
5ae2cc72fb
am:
dad6e47b0f -s ours
Change-Id: I6a126b541a4e636a225a4a37ed6bfdb0c8867378
Andre Eisenbach [Mon, 16 Apr 2018 20:48:55 +0000 (13:48 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153 am:
e28b070c4f am:
38e73feb8e
am:
e81eb688ea -s ours
Change-Id: I56db51e22c4593bc814213fab2f7287d3da853bb
Andre Eisenbach [Mon, 16 Apr 2018 20:27:21 +0000 (13:27 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852 am:
b86ae24aef am:
8c86c0c1da am:
a4755cf297 am:
cbf0dca767 skipped:
775ea97ce3 am:
1077237837
am:
32b5917cd2
Change-Id: Id50274228201e77300aa60055b21d33f4ccdda24
Andre Eisenbach [Mon, 16 Apr 2018 20:26:58 +0000 (13:26 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8 am:
502686433c
am:
5ae2cc72fb
Change-Id: I480bc2813f337bd3a7e46c43350c0b5b4180c1bd
Andre Eisenbach [Mon, 16 Apr 2018 20:26:36 +0000 (13:26 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153 am:
e28b070c4f
am:
38e73feb8e
Change-Id: I0a4785b233684d0c286e092c5d4d707ba3294558
Andre Eisenbach [Mon, 16 Apr 2018 20:21:31 +0000 (13:21 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852 am:
b86ae24aef am:
8c86c0c1da am:
a4755cf297 am:
cbf0dca767 skipped:
775ea97ce3
am:
1077237837
Change-Id: I7fa3cea0b1140f0391075d71522ea26f42e30d44
Andre Eisenbach [Mon, 16 Apr 2018 20:21:10 +0000 (13:21 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8
am:
502686433c
Change-Id: I787c2fa71adce021be2165ba450bd6c15f7db4eb
Andre Eisenbach [Mon, 16 Apr 2018 20:20:50 +0000 (13:20 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153
am:
e28b070c4f
Change-Id: If22296caf1344c4f79ded10842bca65ddb8d2530
Android Build Merger (Role) [Mon, 16 Apr 2018 20:10:06 +0000 (20:10 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852 am:
b86ae24aef am:
8c86c0c1da am:
a4755cf297 am:
cbf0dca767 skipped:
775ea97ce3
Change-Id: Idd464930b9d893647b40a9b14b3ddc692802dac5
Android Build Merger (Role) [Mon, 16 Apr 2018 20:10:04 +0000 (20:10 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852 am:
b86ae24aef am:
8c86c0c1da am:
a4755cf297 am:
cbf0dca767
Change-Id: Ifdf9d93f1e14ee8424aac0131035d1f3a735ff0a
Android Build Merger (Role) [Mon, 16 Apr 2018 20:10:03 +0000 (20:10 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852 am:
b86ae24aef am:
8c86c0c1da am:
a4755cf297
Change-Id: Ic16109cfa49ba248ef79e511e3664cd6fb2056e9
Android Build Merger (Role) [Mon, 16 Apr 2018 20:10:01 +0000 (20:10 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852 am:
b86ae24aef am:
8c86c0c1da
Change-Id: Ic874ee0e6d4cb4e92effb6cc75580dc7b10acc59
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:59 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852 am:
b86ae24aef
Change-Id: I4894c6bd85e9e602b0f1fe34fcc06aa5a1b41388
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:58 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf skipped:
f5be85f852
Change-Id: I09c7fbeb8ca3814d2c91aac744ca5c91fa8e34c4
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:57 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed am:
7d660ff9bf
Change-Id: I6a6369b2bac96ef4926969b5909e85026553aff8
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:56 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8 am:
13113597ed
Change-Id: Ia7b054ec720067d2b84d8e10f768fa92eb802008
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:54 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
94dd5564d8
Change-Id: Ib7066a2e0075b02ba1d1400b559287e3eef08200
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:03 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b skipped:
f7d79a01d8
Change-Id: I07574dac78d1be4aef5a3154b2001c3cd239bad6
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:02 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75 am:
4e7049f54b
Change-Id: Ie238d797d89b25c5bf2cf6e84427773f1b76285c
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:01 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed am:
6d8e884c75
Change-Id: Idc6489856bef71c96be1105a058e9ce1226f90de
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:59 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5 am:
2c2804d3ed
Change-Id: I9cd2497707fba6486827447412b14916f59ea92d
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:58 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13 am:
4c2c4dade5
Change-Id: Iacb795d8e741d01d8c81c95657174f2fb43142c5
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:56 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce skipped:
0c4e21ec13
Change-Id: I3d83c500f4504773a3d9160d984ef91aeaa63d36
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:55 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525 am:
96e39c15ce
Change-Id: I552dd39875722ac041979c4cce15e378cab32d5a
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:53 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
0b036a5525
Change-Id: I855b3b72659643947a5d28f01ac37dd6ab920a4f
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:03 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7 skipped:
ad8199c153
Change-Id: If9b1cbddc778b067b12524d1785b917ae0768190
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:02 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f am:
6c342395e7
Change-Id: Ia2a1ae3af0bdf5c0ddd8c75be724307fa190c951
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:00 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b am:
9be00e438f
Change-Id: I9f969320602f60bd2e33f8ec945ef6d08a6d654c
Android Build Merger (Role) [Mon, 16 Apr 2018 20:07:58 +0000 (20:07 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb am:
399a1b955b
Change-Id: I7f9c21ae2b9fd334c66e3f7975289a206f8082e7
Android Build Merger (Role) [Mon, 16 Apr 2018 20:07:56 +0000 (20:07 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
1a9023fffb
Change-Id: I296f52fdb61084a34b5b9212f119570a073d5fab
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Joseph Pirozzo [Mon, 16 Apr 2018 18:10:11 +0000 (18:10 +0000)]
Merge "AVRCP controller browsing deep copy and get folder range" into pi-dev
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
Merged-In: Iec76691f8a83cd47aa7bf38efc6554139a59bb89
(cherry picked from commit
109a6beee6e532d05418c9aa75bd09dfdbe353ff)
Andre Eisenbach [Mon, 16 Apr 2018 17:04:10 +0000 (10:04 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768 am:
6fdcf70e9c am:
8ea0bccd78
am:
be7219b8e3 -s ours
Change-Id: I3c1f1c7ecb4d398afe34d2b2a4b37505d8084bfb
Andre Eisenbach [Mon, 16 Apr 2018 17:03:58 +0000 (10:03 -0700)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e am:
5f7f3d37bf am:
820e731205
am:
9418254b4b -s ours
Change-Id: I38dda55bda57ea3458823964f85522b9a06f1b9e
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:56 +0000 (09:59 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768 am:
6fdcf70e9c
am:
8ea0bccd78
Change-Id: Ie1a4a1b93c6f2797c0cabb8db522a62aa6678d19
Andre Eisenbach [Mon, 16 Apr 2018 16:59:38 +0000 (09:59 -0700)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e am:
5f7f3d37bf
am:
820e731205
Change-Id: I1d6c100ffc82c04a333de60e75dc16920e5b19fc
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:55 +0000 (09:56 -0700)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768
am:
6fdcf70e9c
Change-Id: Ie9774b0825379aed74243ab225fb925029273f11
Andre Eisenbach [Mon, 16 Apr 2018 16:56:35 +0000 (09:56 -0700)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e
am:
5f7f3d37bf
Change-Id: I5c7467968af58cc3e604b6b7df3d53c61696b116
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
Android Build Merger (Role) [Mon, 16 Apr 2018 16:50:33 +0000 (16:50 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8 skipped:
65bedc6768
Change-Id: If98fd8b677ee7038d8dda5f78cfc56371ba4f400
Android Build Merger (Role) [Mon, 16 Apr 2018 16:50:30 +0000 (16:50 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab am:
b0f36356d8
Change-Id: I8e07c755fa727dbf746395be50271eac5c57a79c
Android Build Merger (Role) [Mon, 16 Apr 2018 16:50:28 +0000 (16:50 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am:
accdcd94ab
Change-Id: I7efc9d1806c1c848220ec6dd18dd2d1848f1158f
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
Android Build Merger (Role) [Mon, 16 Apr 2018 16:49:55 +0000 (16:49 +0000)]
[automerger skipped] DO NOT MERGE SMP: Validate remote elliptic curve points skipped:
4f9ed8f66e
Change-Id: I44071ce2348cc328f417b5a30bd290de49c3e474
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points
Fixes:
72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit
9181ec28da94705a763edbe60bd2a87e5f882beb)
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 [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
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
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
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into nyc-dr1-dev
* changes:
[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:29:14 +0000 (20:29 +0000)]
Merge "DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into nyc-dev
TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into cw-f-dev
* changes:
[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:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into nyc-mr1-dev
* changes:
[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:29:14 +0000 (20:29 +0000)]
Merge changes from topic "am-
175db33b-0d30-4b99-87fe-
9ef5c15643d6" into nyc-mr2-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
[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: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
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: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: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 "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into mnc-dev
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 mnc-dr1.5-dev
* changes:
[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:11 +0000 (18:13 +0000)]
Merge changes from topic "am-
4f00fbdf-3978-4c02-91d3-
d55eeb01b9a9-mnc-dev" into cw-e-dev
* changes:
[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
OSDN Git Service
