OSDN Git Service
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
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into nyc-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into cw-e-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge changes from topic "am-
c847555c-4096-4a49-be7e-
49a3a9c0417a" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]
Merge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into mnc-dev
TreeHugger Robot [Wed, 11 Apr 2018 20:04:54 +0000 (20:04 +0000)]
Merge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into nyc-dev
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into cw-e-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into mnc-dev
TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]
Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into nyc-dev
* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req
TreeHugger Robot [Wed, 11 Apr 2018 15:19:58 +0000 (15:19 +0000)]
Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into nyc-dev
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into cw-e-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into mnc-dev
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into nyc-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into nyc-dev
Stanley Tng [Thu, 5 Apr 2018 16:54:13 +0000 (09:54 -0700)]
DO NOT MERGE Handle bad packet length in gatts_process_read_req
Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Please note that there is another earlier CL that is reverted and this
is the updated one.
Bug:
73172115
Test: Run the test program, poc, that was attached in the bug report
Merged-In: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
Change-Id: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
(cherry picked from commit
cc9c7330d1c3507d745170ae7b2e0546197b7acb)
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:40 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e skipped:
4d0c684647
Change-Id: I382274e4bad3579bbb1030640b38469d0901cdf4
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:39 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b am:
92c087346e
Change-Id: Ie97dff2f752770f39874af0f824f31a3b820a70d
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:37 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39 am:
3e4b66815b
Change-Id: I349cfe1aad0c6856a5818186774c3e3174307462
Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:35 +0000 (16:22 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:
dc67046a39
Change-Id: I70949f88b0e060f0923aa0a942a9d785c1802684
Stanley Tng [Thu, 5 Apr 2018 16:54:13 +0000 (09:54 -0700)]
DO NOT MERGE Handle bad packet length in gatts_process_read_req
Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Please note that there is another earlier CL that is reverted and this
is the updated one.
Bug:
73172115
Test: Run the test program, poc, that was attached in the bug report
Merged-In: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
Change-Id: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
(cherry picked from commit
cc9c7330d1c3507d745170ae7b2e0546197b7acb)
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into nyc-dev
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into nyc-dev
Stanley Tng [Wed, 4 Apr 2018 23:38:22 +0000 (16:38 -0700)]
DO NOT MERGE Drop LE CoC fragments when frame size is too big
Drop the LE CoC data fragments when the received fragment size is too
big.
Test: Runs LE CoC SL4A test, BleCocTest.
Bug:
75298652
Merged-In: I529944341e9e67a39e7ec7e740d5ada3db8cc23a
Change-Id: I529944341e9e67a39e7ec7e740d5ada3db8cc23a
Myles Watson [Wed, 21 Mar 2018 23:45:32 +0000 (16:45 -0700)]
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
Change I63b857d031c55d3a0754e4101e330843eb422b2a caused a double
free. Move the free call to pan_data_buf_ind_cb().
Free the buffer before every return in pan_data_buf_ind_cb.
Bug:
74950468
Test: manual tethering test with DUT sharing its connection
Change-Id: If4526f3042699581e2cdde79a362eef0f83768eb
Merged-In: If4526f3042699581e2cdde79a362eef0f83768eb
(cherry picked from commit
2e0deb1d135805b37697f0e02a55269c6cc500fe)
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:12 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61 skipped:
97ddd22ee8
Change-Id: Ieb162bb1cd63758ac343389e381923c488bce206
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:11 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6 am:
67ca6c7f61
Change-Id: Ieccfefa8032ec1a515e8df3d6e618e5d7e470b44
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:09 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48 am:
cd6b4f2aa6
Change-Id: I21d5a838027481e8f55d47fd21a83f837efa2429
Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:08 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am:
8f34bd0e48
Change-Id: If70f1c69d8d8d8de9fbeae55de123f9dba3b8bf8
Myles Watson [Wed, 21 Mar 2018 23:45:32 +0000 (16:45 -0700)]
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback
Change I63b857d031c55d3a0754e4101e330843eb422b2a caused a double
free. Move the free call to pan_data_buf_ind_cb().
Free the buffer before every return in pan_data_buf_ind_cb.
Bug:
74950468
Test: manual tethering test with DUT sharing its connection
Change-Id: If4526f3042699581e2cdde79a362eef0f83768eb
Merged-In: If4526f3042699581e2cdde79a362eef0f83768eb
(cherry picked from commit
2e0deb1d135805b37697f0e02a55269c6cc500fe)
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:33 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b
Change-Id: I30ae8f458e18a4b4fb2c8457dca65ce68307cf46
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:32 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9
Change-Id: I9d0d9847904b361d457bba6b0f7dba6db9e6e10a
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:30 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
Change-Id: I4560a77109abd6772f9a7ef7808d073699e23dc5
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:28 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
Change-Id: I45246189f80aedb86c70064d85006ac8f5ba00ac
Hansong Zhang [Mon, 2 Apr 2018 16:55:58 +0000 (09:55 -0700)]
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
Check the number of UUIDs from remote device
Bug:
74016921
Test: manual
Change-Id: I5d3a90bad63af5b22dd155f1d60869b8149d350c
Hansong Zhang [Mon, 2 Apr 2018 16:29:49 +0000 (09:29 -0700)]
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
Check the number of UUIDs from remote device
Bug:
74016921
Test: manual
Change-Id: I7e1fd420c96bdb4d8b1bb129eb85045f9e3da443
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:25 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42
Change-Id: I608a9e64ae1882c318a8bc8f2710990679b496a0
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:23 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c
Change-Id: Id9f1cb41fde0ced026415ecf20766edd5df593ca
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:22 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb
Change-Id: Id73dfb4249a191a95a30edf5e43948c6fcafedb6
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:20 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74
Change-Id: I7c3bc0a75233b759ae029dd7297ea8f77db59723
Hansong Zhang [Fri, 30 Mar 2018 23:55:49 +0000 (16:55 -0700)]
DO NOT MERGE Fix unexpected behavior in smp_sm_event
Bug:
74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53
Hansong Zhang [Fri, 30 Mar 2018 23:55:49 +0000 (16:55 -0700)]
DO NOT MERGE Fix unexpected behavior in smp_sm_event
Bug:
74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53
Ajay Panicker [Fri, 2 Feb 2018 09:11:37 +0000 (01:11 -0800)]
DO NOT MERGE: AVRCP: Check number of text attribute values in response
Test: Build
Bug:
71603410
Change-Id: I6f822b0bc7fc2fb042a70b64cff61583a86b36e2
TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to" into nyc-dev
TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: AVRCP: Check number of text attributes in response" into nyc-dev
TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into nyc-dev
Hansong Zhang [Fri, 9 Feb 2018 23:23:07 +0000 (15:23 -0800)]
DO NOT MERGE Truncate new line characters when adding string to config
Bug:
70808273
Test: test with a device with newline character in name
Change-Id: Ie7e0b5d93047bc12a9cb84cc15f7f68f38f36441
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:44 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc
Change-Id: Ia5e49a4cb49329fd3a2e5b687d9e5372f88b35df
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:43 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901
Change-Id: I17e31eed9ba3a869de51e0c472dd2889bc6a951c
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:41 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda
Change-Id: Ia1ab5cc9ce36a3087eff3b7caacab41af9979c18
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:40 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88
Change-Id: I338ba0cef8c7b49da0d305a8e2e0217f19acd19c
Hansong Zhang [Fri, 9 Feb 2018 22:21:09 +0000 (14:21 -0800)]
DO NOT MERGE Truncate new line characters when adding string to config
Bug:
70808273
Test: test with a device with newline character in name
Change-Id: Ie7e0b5d93047bc12a9cb84cc15f7f68f38f36441
Ajay Panicker [Fri, 2 Feb 2018 08:56:43 +0000 (00:56 -0800)]
DO NOT MERGE: AVRCP: Check number of text attributes in response
Test: Build
Bug:
71603315
Change-Id: Ieda5e410057062533ae09bd977bfe7f758a55140
Ajay Panicker [Fri, 2 Feb 2018 09:26:34 +0000 (01:26 -0800)]
DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
Test: Build
Bug:
71603553
Change-Id: I978270605cfaa3b833d6c19f1b1d2cd5a82ac079
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:16 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407
Change-Id: Iae89be86bc20908521d2c99a099f8728c4e9f820
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:15 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4
Change-Id: Iaec135fc10b631d0ba46467ba71692f8a60e477c
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:13 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a
Change-Id: Idde655e8a3377560317189bbc49620670c5923c8
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:12 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4
Change-Id: I2462f1128b027a515b616beb005c879e6d372f27
Myles Watson [Fri, 12 Jan 2018 01:43:40 +0000 (17:43 -0800)]
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
Bug:
69384124
Test: Connect a headset
Change-Id: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe
Myles Watson [Fri, 12 Jan 2018 01:43:40 +0000 (17:43 -0800)]
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
Bug:
69384124
Test: Connect a headset
Change-Id: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe
Myles Watson [Tue, 16 Jan 2018 18:08:23 +0000 (18:08 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c
am:
0f9c39d5cd
Change-Id: I56a016ee9e1459472e97a341b8cbc9b8253b230b
Myles Watson [Tue, 16 Jan 2018 18:03:20 +0000 (18:03 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d
am:
1c4f74e02c
Change-Id: I160dce825ef9490fea2c9614472d4bb2477cfb40
Myles Watson [Tue, 16 Jan 2018 17:58:18 +0000 (17:58 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4
am:
1f573b136d
Change-Id: I2d2d968c09bc690ec03ee54a1a4060ef2ba71eac
Myles Watson [Tue, 16 Jan 2018 17:53:49 +0000 (17:53 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
am:
f3c40264c4
Change-Id: I22c76d476befb51d5e8b8c1d5557e711d8949507
TreeHugger Robot [Tue, 16 Jan 2018 17:46:17 +0000 (17:46 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
Ajay Panicker [Sat, 13 Jan 2018 01:59:21 +0000 (01:59 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4
am:
786be83578 -s ours
Change-Id: Ie6a054ff92fb0fe993d900b0c4a3873bb62e097e
Ajay Panicker [Sat, 13 Jan 2018 01:53:55 +0000 (01:53 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699
am:
45490dc0b4
Change-Id: Ifaa0e2129b7dbea668016813d969b94fd8c45960
Ajay Panicker [Sat, 13 Jan 2018 01:45:20 +0000 (01:45 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6
am:
9f936a8699
Change-Id: Ie5405de54e55239946d2cf608f0fe1d7e2229dc3
Ajay Panicker [Sat, 13 Jan 2018 01:39:51 +0000 (01:39 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev
am:
4207e26df6
Change-Id: I187de7f4dd45ea3fa3b6921d0d2ec54d23da9b81
Ajay Panicker [Sat, 13 Jan 2018 01:36:13 +0000 (01:36 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75
am:
b70b57eaf8 -s ours
Change-Id: Ifdb9178a0d6ba8655f5b7c93405b6155dd1afe33
Ajay Panicker [Sat, 13 Jan 2018 01:33:24 +0000 (01:33 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654
am:
12d12aac75
Change-Id: I1714e438cbd56e7ffe14e5f260adf0eed8100f70
Ajay Panicker [Sat, 13 Jan 2018 01:29:56 +0000 (01:29 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev
Ajay Panicker [Sat, 13 Jan 2018 01:29:51 +0000 (01:29 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev
Ajay Panicker [Sat, 13 Jan 2018 01:27:12 +0000 (01:27 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd
am:
d95e0eb654
Change-Id: I65c4d588423ca11d897d86c11dc65f13004bdfb5
Ajay Panicker [Sat, 13 Jan 2018 01:20:49 +0000 (01:20 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev
am:
90368e62cd
Change-Id: Ie5c417600fe460bef706cc6db879fb1ddbd37eb7
Myles Watson [Sat, 13 Jan 2018 01:10:01 +0000 (01:10 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf
am:
df4385a4f0 -s ours
Change-Id: Ia0fb19da63c464c6821288c761126a58f4685e3f
Myles Watson [Sat, 13 Jan 2018 01:09:44 +0000 (01:09 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5
am:
52de7b9029 -s ours
Change-Id: I1ac8501dca4c9d1b44f400c093cfdc2069d09339
Myles Watson [Sat, 13 Jan 2018 01:07:21 +0000 (01:07 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8
am:
661e71faaf
Change-Id: I15d0e141edb9f775e5a7987145562353b16d861c
Myles Watson [Sat, 13 Jan 2018 01:06:51 +0000 (01:06 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282
am:
27626267a5
Change-Id: I73f0933ab850b4bb3eedf66cc9c588d04d74129b
TreeHugger Robot [Sat, 13 Jan 2018 01:05:43 +0000 (01:05 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev
Ajay Panicker [Sat, 13 Jan 2018 01:05:11 +0000 (01:05 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev
Myles Watson [Sat, 13 Jan 2018 01:00:24 +0000 (01:00 +0000)]
BNEP: Check received frame type am:
61e561d8b7
am:
fa946e7bd8
Change-Id: Ia4d4f3dbaab1922f1f47958b216acfc63cd039dd
Myles Watson [Sat, 13 Jan 2018 01:00:06 +0000 (01:00 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e
am:
8fa876b282
Change-Id: Ie9c47005fcc5891b2b9c382c032d4e4bed3cb591
Myles Watson [Sat, 13 Jan 2018 00:55:53 +0000 (00:55 +0000)]
BNEP: Check received frame type
am:
61e561d8b7
Change-Id: Ic00e478daf740532a20a9719eb76922c96e56c81
Myles Watson [Sat, 13 Jan 2018 00:55:36 +0000 (00:55 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev
am:
7cfaf8724e
Change-Id: I194a6c63954b7b2847973974005c6d79aa11289c
Myles Watson [Sat, 13 Jan 2018 00:47:00 +0000 (00:47 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev
Myles Watson [Thu, 11 Jan 2018 22:20:26 +0000 (14:20 -0800)]
BNEP: Check received frame type
Bug:
68818034
Test: build
Change-Id: I2b9f32b92d72f226361e6a80f20f9c7ee77f6019
Merged-In: I2b9f32b92d72f226361e6a80f20f9c7ee77f6019
TreeHugger Robot [Sat, 13 Jan 2018 00:38:16 +0000 (00:38 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev
Myles Watson [Wed, 10 Jan 2018 17:51:28 +0000 (09:51 -0800)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback
Patch from b/
67078939
Test: build
Bug:
67110692
Change-Id: I63b857d031c55d3a0754e4101e330843eb422b2a
Merged-In: I63b857d031c55d3a0754e4101e330843eb422b2a
Stanley Tng [Fri, 12 Jan 2018 22:13:54 +0000 (22:13 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f am:
8909982e6f
am:
3b485ad0f7 -s ours
Change-Id: If144e4104654de7d198b2bb641bdb0c5c65af625
Stanley Tng [Fri, 12 Jan 2018 22:09:29 +0000 (22:09 +0000)]
Merge "DO NOT MERGE Remove memory reference to invalid mem in error log" into mnc-dev am:
cc798ea2e5 am:
92268a691f
am:
8909982e6f
Change-Id: I3438b832e39d85a4e8d598e8f611e5d8a3ef185b