OSDN Git Service
Android Build Merger (Role) [Fri, 13 Jul 2018 09:17:20 +0000 (09:17 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40
Change-Id: I9f2e6e495a1af2d31fe6b32feff78dc20d88b4d0
Android Build Merger (Role) [Fri, 13 Jul 2018 09:17:18 +0000 (09:17 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76
Change-Id: I88b6879652a667ace51c8e304eeeb0f394493b58
Android Build Merger (Role) [Fri, 13 Jul 2018 09:16:03 +0000 (09:16 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06
Change-Id: Iebe8378ad968c488cbc4b88a986566d40c4bae07
Android Build Merger (Role) [Fri, 13 Jul 2018 09:16:01 +0000 (09:16 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd
Change-Id: Ia9dfcc76e8a3a464d1d000e59c998d7958119e83
Android Build Merger (Role) [Fri, 13 Jul 2018 09:15:58 +0000 (09:15 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f
Change-Id: If6a5bdde9eee5540844938956063199c9e640da3
Jakub Pawlowski [Fri, 22 Jun 2018 05:56:11 +0000 (22:56 -0700)]
Add packet length checks in l2cble_process_sig_cmd
Bug:
80261585
Test: compilation
Change-Id: Icf55747dc948bcce140a12658237554938e2d717
Merged-In: Icf55747dc948bcce140a12658237554938e2d717
Android Build Merger (Role) [Fri, 13 Jul 2018 06:58:12 +0000 (06:58 +0000)]
[automerger] Don't use Address after it was deleted am:
228712652a
Change-Id: Iecd6906bc9eb7ca9376a5094377e25e41bf2dd67
Jakub Pawlowski [Wed, 11 Jul 2018 09:57:07 +0000 (02:57 -0700)]
Don't use Address after it was deleted
Bug:
110216173
Change-Id: Id3364cf53153eafed478546d7347ed1673217e91
Merged-In: Id3364cf53153eafed478546d7347ed1673217e91
Android Build Merger (Role) [Fri, 13 Jul 2018 04:46:33 +0000 (04:46 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
329b7cfb44
Change-Id: I978797eaf4d4b72432b1b5c1cd91c6374ff39f6a
Jakub Pawlowski [Fri, 22 Jun 2018 05:56:11 +0000 (22:56 -0700)]
Add packet length checks in l2cble_process_sig_cmd
Bug:
80261585
Test: compilation
Change-Id: Icf55747dc948bcce140a12658237554938e2d717
Merged-In: Icf55747dc948bcce140a12658237554938e2d717
TreeHugger Robot [Thu, 12 Jul 2018 22:28:54 +0000 (22:28 +0000)]
Merge changes from topic "am-
3e56facc-2987-45a7-902e-
643b62b0dad3" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 22:28:54 +0000 (22:28 +0000)]
Merge "DO NOT MERGE HID Host: Check L2CAP packet data length" into nyc-dev
TreeHugger Robot [Thu, 12 Jul 2018 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into cw-e-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 22:17:26 +0000 (22:17 +0000)]
Merge "DO NOT MERGE HID Host: Check L2CAP packet data length" into mnc-dev
TreeHugger Robot [Thu, 12 Jul 2018 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into nyc-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 21:10:42 +0000 (21:10 +0000)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into nyc-dev
Android Build Merger (Role) [Thu, 12 Jul 2018 18:01:25 +0000 (18:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27
Change-Id: I285fea77251b0f7734969ba989a0d40d26e95bd3
Hansong Zhang [Thu, 12 Jul 2018 18:00:53 +0000 (11:00 -0700)]
DO NOT MERGE Fix OOB read in process_l2cap_cmd
Test: manual
Bug:
79488381
Change-Id: I723866ed40d3647fed99875f659bb95df96a6969
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:18 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05
Change-Id: Ie004d032313f29c4124c2a114469886429c4cccd
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:15 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c
Change-Id: I95b70f63b81df6f58b516b83853fc0bbef7eccc8
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:12 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624
Change-Id: Idb5ac3b18ec180a90eca120754d601c1ba68edbf
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:10 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca
Change-Id: I3e68fbd29ce151c4829fe6077d76bc3822915c8f
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:07 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d
Change-Id: Ic7b10e46c591edff7f86c06dee6beb8ca8798121
Jakub Pawlowski [Fri, 22 Jun 2018 11:46:39 +0000 (04:46 -0700)]
SDP: return error on offset bigger than atribute length
Test: none
Bug:
79217770
Change-Id: I8b594882dd07644b1a747c53d6166db466b7e998
Merged-In: I8b594882dd07644b1a747c53d6166db466b7e998
TreeHugger Robot [Wed, 11 Jul 2018 17:36:21 +0000 (17:36 +0000)]
Merge "DO NOT MERGE HFP: Fix out of bound access in phone number processing" into nyc-dev
Android Build Merger (Role) [Thu, 28 Jun 2018 00:11:12 +0000 (00:11 +0000)]
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204
Change-Id: Ie6f3408d074604cf89aa9c8dc5f63447fdba8b64
Jack He [Wed, 27 Jun 2018 00:53:24 +0000 (17:53 -0700)]
DO NOT MERGE HFP: Fix out of bound access in phone number processing
* Write at most sizeof(dialnum) chars into dialnum array in ClccResponse
method
* Write at most sizeof(ag_res.str) - 5 chars into ag_res.str array in
PhoneStateChange method
Bug:
79431031
Bug:
79266386
Test: make call with super long phone numbers
Change-Id: I98e7687ac4055800aa46626c6b1c866e52e474df
Merged-In: I98e7687ac4055800aa46626c6b1c866e52e474df
Android Build Merger (Role) [Thu, 7 Jun 2018 21:28:24 +0000 (21:28 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a
Change-Id: Iabccbce010c9c418b63a638c8936cc8616799070
Hansong Zhang [Thu, 7 Jun 2018 21:18:22 +0000 (14:18 -0700)]
DO NOT MERGE HID Host: Check L2CAP packet data length
Bug:
80493272
Test: manual
Change-Id: I8b1acd11616684729752195fabb4fa34c46a508d
Android Build Merger (Role) [Thu, 7 Jun 2018 21:27:54 +0000 (21:27 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349
Change-Id: Ib7c331322571106ffee638bc2deb2f2392df3a66
Android Build Merger (Role) [Thu, 7 Jun 2018 21:27:51 +0000 (21:27 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7
Change-Id: Ib12a006ee1c5d3ed781e674e2091b7bf8c30036b
Android Build Merger (Role) [Thu, 7 Jun 2018 21:27:49 +0000 (21:27 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060
Change-Id: I999dbbc621168887e993159271c59aa526af4d8e
Android Build Merger (Role) [Thu, 7 Jun 2018 21:27:47 +0000 (21:27 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2
Change-Id: I98eea999519f71f72df32c82a42ebcaae9aeb95f
Android Build Merger (Role) [Thu, 7 Jun 2018 21:27:45 +0000 (21:27 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2
Change-Id: I4356335c6ee6b0e3717e22d94ff9e8bb0574e663
Hansong Zhang [Thu, 7 Jun 2018 21:02:30 +0000 (14:02 -0700)]
DO NOT MERGE HID Host: Check L2CAP packet data length
Bug:
80493272
Test: manual
Change-Id: I8b1acd11616684729752195fabb4fa34c46a508d
TreeHugger Robot [Thu, 7 Jun 2018 01:53:54 +0000 (01:53 +0000)]
Merge "DO NOT MERGE: Don't reuse buffer when building response" into nyc-dev
TreeHugger Robot [Thu, 7 Jun 2018 01:53:54 +0000 (01:53 +0000)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f
DO NOT MERGE: Don't reuse buffer when building response
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:38 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f
Change-Id: I4911528515373e3dfc0763d5f793df29fb64d4e8
Ajay Panicker [Wed, 6 Jun 2018 21:58:54 +0000 (14:58 -0700)]
DO NOT MERGE: Don't reuse buffer when building response
Bug:
79541338
Test: Compile and connect to remote headset
Change-Id: I5e059615db589e165630f39d631a922006c2d70f
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:25 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98
Change-Id: Ifbff9c61654090104521be186d0bce9a3ae337a8
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:23 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d
Change-Id: I5d7ceaba658d90e8a8931b50a6c8774f2c690b5d
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:21 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d
Change-Id: I9d251934afe063299b4b7f36ea63c214b5188577
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:20 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351
Change-Id: I7b8076d21aeeb80c469764d0643ee54e9de049ff
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:18 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8
Change-Id: I73fc976256c6af11d7431778b3c962a2816f5f5f
Ajay Panicker [Wed, 6 Jun 2018 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE: Don't reuse buffer when building response
Bug:
79541338
Test: Compile and connect to remote headset
Change-Id: I2c00660bb551bbac58df88d2df07c98a30871e58
Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:22 +0000 (03:48 +0000)]
[automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb am:
6b2f63f880 am:
ac8793939a am:
862eb4827b am:
e7c8891319
Change-Id: I84ba18bda5c2adbc83181bcd9fbea0291fb7a8e7
Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:20 +0000 (03:48 +0000)]
[automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb am:
6b2f63f880 am:
ac8793939a am:
862eb4827b
Change-Id: I336035e480bcd33d67b90543a9f81fe919dc649a
Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:17 +0000 (03:48 +0000)]
[automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb am:
6b2f63f880 am:
ac8793939a
Change-Id: Ibde13c7a9f0af5a7e4f38db226532780b8fc50fa
Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:15 +0000 (03:48 +0000)]
[automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb am:
6b2f63f880
Change-Id: I874adb503bb51f88ad7a934b697221f544fc5488
Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:12 +0000 (03:48 +0000)]
[automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb
Change-Id: I945a8ce34b41a7df4a3c853ad5b4ba51d0136251
Pavlin Radoslavov [Thu, 31 May 2018 17:23:02 +0000 (10:23 -0700)]
Add checks whether the AVDTP element data length is valid
Bug:
78288378
Test: Manual: Python script and extra logging
Change-Id: I576d798d8b566946a3f2d973cb9d4e8dbd22d09e
Merged-In: I715b5977c833d33ff798f008fbf244effa13ea1f
Android Build Merger (Role) [Tue, 5 Jun 2018 00:49:03 +0000 (00:49 +0000)]
[automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am:
6245466d55
Change-Id: I63ea708b1a1c087724749cd587cbcad86e1fe30c
Jack He [Tue, 5 Jun 2018 00:40:42 +0000 (17:40 -0700)]
DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf
Bug:
79164722
Bug:
78286118
Test: make
Change-Id: I04fc994d9bca80aa4711118d3c5be02f2b809a48
Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:10 +0000 (23:10 +0000)]
[automerger] BNEP: Fix OOB access in bnep_data_ind am:
0bd01271c4 am:
8f9b349c23 am:
81dcda9a5a am:
eee28a5a06 am:
3ba9845cad
Change-Id: I17a958293bb80866db6348f68a3c477a48f7de53
Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:07 +0000 (23:10 +0000)]
[automerger] BNEP: Fix OOB access in bnep_data_ind am:
0bd01271c4 am:
8f9b349c23 am:
81dcda9a5a am:
eee28a5a06
Change-Id: I5018c4115f5502d5f88c955f77221339663eca91
Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:05 +0000 (23:10 +0000)]
[automerger] BNEP: Fix OOB access in bnep_data_ind am:
0bd01271c4 am:
8f9b349c23 am:
81dcda9a5a
Change-Id: I1cd6cf2b54334cff0bb8568cb0dd5ef6121ca444
Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:03 +0000 (23:10 +0000)]
[automerger] BNEP: Fix OOB access in bnep_data_ind am:
0bd01271c4 am:
8f9b349c23
Change-Id: I404328203b34b5e48d2d5fbca3667e9dac9ca742
Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:01 +0000 (23:10 +0000)]
[automerger] BNEP: Fix OOB access in bnep_data_ind am:
0bd01271c4
Change-Id: I12f77728b3ad0f10b3cd0f34a7068272573e6ea4
Jack He [Fri, 1 Jun 2018 21:00:42 +0000 (14:00 -0700)]
BNEP: Fix OOB access in bnep_data_ind
* Stop reading the L2CAP packet if packet length is 0
* Process the buffer for BNEP_EXTENSION_CONTROL packet before advancing
the buffer pointer by length of payload
* Reject BNEP_EXTENSION_CONTROL packet when the payload size is zero
* Move error logging to more appropriate locations at where the OOB access
is most likely triggered
Bug:
78286118
Bug:
79164722
Test: Send zero length L2CAP packet to BNEP, send invalid
BNEP_EXTENSION_CONTROL packet
Change-Id: I7e18632b8faab1b6aaca1bff1b7f55d69962729e
Merged-In: I7e18632b8faab1b6aaca1bff1b7f55d69962729e
(cherry picked from commit
3c799a6e25abdf6bacb660ff7a06338836cc7356)
Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:24 +0000 (19:11 +0000)]
[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:
0a8453ba41 am:
f60bc5a9a8 am:
9619144b16 am:
b37a3d0a19 am:
5793ade00d
Change-Id: I00c61a56f5feed5d654f8a876d21a995bac6ab36
Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:22 +0000 (19:11 +0000)]
[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:
0a8453ba41 am:
f60bc5a9a8 am:
9619144b16 am:
b37a3d0a19
Change-Id: I95a38db1c94e545a10f894f56319cb9b38c465fa
Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:21 +0000 (19:11 +0000)]
[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:
0a8453ba41 am:
f60bc5a9a8 am:
9619144b16
Change-Id: I164001793fe32ef903c430594d93dc800e8c396f
Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:19 +0000 (19:11 +0000)]
[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:
0a8453ba41 am:
f60bc5a9a8
Change-Id: I36cca997401a549ed94036dd48efa7ba00d73fd4
Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:17 +0000 (19:11 +0000)]
[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:
0a8453ba41
Change-Id: I9a8fc8c90e84297bde904dc30c31c745e0e15cbd
akirilov [Fri, 27 Apr 2018 22:05:14 +0000 (15:05 -0700)]
Fixes two bluetooth bugs causing remote overreads (2/2)
Bug:
74075873
Test: manual
Change-Id: I28a78084a1ab451b407ee6e7a5495c1e43ed757b
Merged-In: I76058b11c90dc40b78f26fb64b74d609f3473f5d
Android Build Merger (Role) [Thu, 31 May 2018 22:59:15 +0000 (22:59 +0000)]
[automerger] Decrease length after reading from array in process_service_attr_req am:
76e962892e am:
7c0954970d am:
a2c06775c0 am:
c1b04d4179 am:
7f9f2bbf93
Change-Id: Ifb792068a2f2f190e8c43c96b6a512bdba907f5a
Android Build Merger (Role) [Thu, 31 May 2018 22:59:12 +0000 (22:59 +0000)]
[automerger] Decrease length after reading from array in process_service_attr_req am:
76e962892e am:
7c0954970d am:
a2c06775c0 am:
c1b04d4179
Change-Id: I3aa367983196c35c902d46e96b82378acd1b2e2b
Android Build Merger (Role) [Thu, 31 May 2018 22:59:10 +0000 (22:59 +0000)]
[automerger] Decrease length after reading from array in process_service_attr_req am:
76e962892e am:
7c0954970d am:
a2c06775c0
Change-Id: I299635da00bbe1bbe165fadc6d585eeaa2518782
Android Build Merger (Role) [Thu, 31 May 2018 22:59:09 +0000 (22:59 +0000)]
[automerger] Decrease length after reading from array in process_service_attr_req am:
76e962892e am:
7c0954970d
Change-Id: I1de298ca18d15b94345fb616de4688b952a06dce
Android Build Merger (Role) [Thu, 31 May 2018 22:59:07 +0000 (22:59 +0000)]
[automerger] Decrease length after reading from array in process_service_attr_req am:
76e962892e
Change-Id: I32728f7171047fc39b6d166bd6e13be053542c51
Jakub Pawlowski [Tue, 29 May 2018 23:25:56 +0000 (16:25 -0700)]
Decrease length after reading from array in process_service_attr_req
Test: compilation
Bug:
78136677
Change-Id: I4807a350e2b4764a93f104ce88f23a957a7e85c0
Merged-In: I4807a350e2b4764a93f104ce88f23a957a7e85c0
Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]
Merge changes from topic "am-
94f6d099-67a7-4fc1-95d1-
65272646c688" into nyc-dr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]
Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into nyc-dev
Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into mnc-dr1.5-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into cw-e-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into mnc-dr-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]
Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into mnc-dev
Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into nyc-dr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into nyc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
TreeHugger Robot [Thu, 31 May 2018 21:18:04 +0000 (21:18 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff-nyc-dev" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
TreeHugger Robot [Thu, 31 May 2018 21:18:04 +0000 (21:18 +0000)]
Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into nyc-dev
TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into mnc-dr1.5-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into cw-e-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into mnc-dr-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]
Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into mnc-dev
TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into nyc-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
TreeHugger Robot [Thu, 31 May 2018 17:41:46 +0000 (17:41 +0000)]
Merge changes from topic "am-
5821813f-624a-468d-ae05-
8b2918b15c74-nyc-dev" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807
DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event
TreeHugger Robot [Thu, 31 May 2018 17:41:46 +0000 (17:41 +0000)]
Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into nyc-dev
TreeHugger Robot [Thu, 31 May 2018 17:41:13 +0000 (17:41 +0000)]
Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into mnc-dev
Android Build Merger (Role) [Wed, 30 May 2018 17:54:31 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f
Change-Id: I26448362b705378e5393f8a621a39db54c656580
Android Build Merger (Role) [Wed, 30 May 2018 17:54:30 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111
Change-Id: Icd6b0ce2d5992e0ddc60146639c69cb092dc6bdf
Android Build Merger (Role) [Wed, 30 May 2018 17:54:27 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975
Change-Id: I930a5cfd8ddecf3782b878d307aa576e47f49164
Android Build Merger (Role) [Wed, 30 May 2018 17:54:26 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f
Change-Id: I7c1149eb4ace84dd30921e2d77b0e413540c1e98
Android Build Merger (Role) [Wed, 30 May 2018 17:54:24 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938
Change-Id: I3fc3934d98a3d29f14f13246241ae2eff030972d
Android Build Merger (Role) [Wed, 30 May 2018 17:26:58 +0000 (17:26 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76
Change-Id: Ic3210b72e65bdd3cd26fe3c08f317e6f26254f06
Myles Watson [Tue, 29 May 2018 23:55:58 +0000 (16:55 -0700)]
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: I71392cf1a70567fec957feb36768069ac5258aa1
(cherry picked from commit
ef7dddabbd70222fa0fafc97e8562d977f550d26)