OSDN Git Service
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:46 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0
Change-Id: I39f72d38038768d9207455399184cccde2ccba4b
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:44 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c
Change-Id: Ib332da78669cd9e8b6c1d3f25d54cc8df23b444a
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:41 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311
Change-Id: Idf12259570aae1cf15a4f4805df093a8d0dabf43
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) [Tue, 5 Jun 2018 03:48:29 +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 am:
c25b7e056e am:
515cf6983e am:
8dca5d6981
Change-Id: I10eba2bac9686a5f50b736d1bc38caa0cd56265a
Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:27 +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 am:
c25b7e056e am:
515cf6983e
Change-Id: I30fe1a2edd100c78a3b4964f9687b7c666217ad0
Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:24 +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 am:
c25b7e056e
Change-Id: I526e9afc2a7bb0e101f4d6a70e0e3cb1126e72ca
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:10 +0000 (00:49 +0000)]
[automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am:
6245466d55 am:
b8af4e4a83 am:
a5fc127aa7 am:
1321566723
Change-Id: I61ca7ec910613a253d5611d71fdcf223a367ace4
Android Build Merger (Role) [Tue, 5 Jun 2018 00:49:08 +0000 (00:49 +0000)]
[automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am:
6245466d55 am:
b8af4e4a83 am:
a5fc127aa7
Change-Id: I1cf449cd8ec0c4cbd3ca7176900b5c803cc24067
Android Build Merger (Role) [Tue, 5 Jun 2018 00:49:06 +0000 (00:49 +0000)]
[automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am:
6245466d55 am:
b8af4e4a83
Change-Id: Ieab711bb2c2408a09c13032c775a819c2695cb87
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:16 +0000 (23:10 +0000)]
[automerger] BNEP: Fix OOB access in bnep_data_ind am:
0bd01271c4 am:
8f9b349c23 am:
81dcda9a5a am:
eee28a5a06 am:
3ba9845cad am:
7211394f5a am:
8c679a453a am:
452fcb6a05
Change-Id: I88ef6244852f3391a864cc13dc559d97cc8d61d6
Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:14 +0000 (23:10 +0000)]
[automerger] BNEP: Fix OOB access in bnep_data_ind am:
0bd01271c4 am:
8f9b349c23 am:
81dcda9a5a am:
eee28a5a06 am:
3ba9845cad am:
7211394f5a am:
8c679a453a
Change-Id: I57dfaa5eceea67bca11ba561a5010130be0066fe
Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:12 +0000 (23:10 +0000)]
[automerger] BNEP: Fix OOB access in bnep_data_ind am:
0bd01271c4 am:
8f9b349c23 am:
81dcda9a5a am:
eee28a5a06 am:
3ba9845cad am:
7211394f5a
Change-Id: I9a39f998411705e5062c9757db52778081be495c
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:46 +0000 (19:11 +0000)]
[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:
0a8453ba41 am:
f60bc5a9a8 am:
9619144b16 am:
b37a3d0a19 am:
5793ade00d am:
537c7ed692 am:
54cd4ff702 skipped:
2cdb021844
Change-Id: Icca2bb081562e0544ca1f31dfc323da155d3c10b
Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:27 +0000 (19:11 +0000)]
[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:
0a8453ba41 am:
f60bc5a9a8 am:
9619144b16 am:
b37a3d0a19 am:
5793ade00d am:
537c7ed692 am:
54cd4ff702
Change-Id: I787623688baa19c03cc7855411c7b2432f3cdd46
Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:26 +0000 (19:11 +0000)]
[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:
0a8453ba41 am:
f60bc5a9a8 am:
9619144b16 am:
b37a3d0a19 am:
5793ade00d am:
537c7ed692
Change-Id: I11df3603cd3a8a9b31d088b8f543a3ce0ae97095
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:21 +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 am:
6a80e4ae1a am:
94570f9e83 am:
d0ba182019
Change-Id: I9a369b77217ff32c4e158a4f741e0689ac7d9ead
Android Build Merger (Role) [Thu, 31 May 2018 22:59:19 +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 am:
6a80e4ae1a am:
94570f9e83
Change-Id: Ied31c4af4e55e38943c45b62588b02f16734fb77
Android Build Merger (Role) [Thu, 31 May 2018 22:59:17 +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 am:
6a80e4ae1a
Change-Id: I2d103ea30fffae0be12e41cd9787fb8de760dc8a
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:05:07 +0000 (22:05 +0000)]
Merge "RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)" into nyc-mr2-dev
Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]
Merge changes from topic "am-
94f6d099-67a7-4fc1-95d1-
65272646c688" into cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880 am:
1550baf2c5
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880
[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 changes from topic "am-
94f6d099-67a7-4fc1-95d1-
65272646c688" into nyc-mr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880
[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 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:38 +0000 (22:04 +0000)]
Merge changes from topic "am-
94f6d099-67a7-4fc1-95d1-
65272646c688" into nyc-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880 am:
1550baf2c5 am:
2d0acadd8c
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880 am:
1550baf2c5
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880
[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: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 cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec am:
3a501fb77b
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec
[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-mr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec
[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-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)
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-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec am:
3a501fb77b am:
fa56bb0ab9
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec am:
3a501fb77b
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec
[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)
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 cw-f-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865
[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 changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865
[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 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:18:04 +0000 (21:18 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff-nyc-dev" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8 am:
005feb04aa
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865
[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: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 cw-f-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf am:
3357f0c98e
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf
[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-mr1-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf
[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-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 21:17:08 +0000 (21:17 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf am:
3357f0c98e am:
55ccee577b
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf am:
3357f0c98e
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf
[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 17:41:46 +0000 (17:41 +0000)]
Merge changes from topic "am-
5821813f-624a-468d-ae05-
8b2918b15c74-nyc-dev" into cw-f-dev
* changes:
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467
[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 changes from topic "am-
5821813f-624a-468d-ae05-
8b2918b15c74-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467
[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 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:46 +0000 (17:41 +0000)]
Merge changes from topic "am-
5821813f-624a-468d-ae05-
8b2918b15c74-nyc-dev" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d am:
f66eddbcb4
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467
[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: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:36 +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 am:
09bedb85bf am:
3357f0c98e am:
55ccee577b
Change-Id: I54d99dd008563a002eefa6bc39a9bc7df91ce4c8
Android Build Merger (Role) [Wed, 30 May 2018 17:54:34 +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 am:
09bedb85bf am:
3357f0c98e
Change-Id: Ic873aa80e92bd02488b0abc3d56bedb6c221c880
Android Build Merger (Role) [Wed, 30 May 2018 17:54:33 +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 am:
09bedb85bf
Change-Id: I45681640618b7dd21055547b1a21864f716c339d
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:27:02 +0000 (17:27 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8 am:
005feb04aa
Change-Id: I4be51ae13aa73a4b474289dd21bcaeb82c575a30
Android Build Merger (Role) [Wed, 30 May 2018 17:27:01 +0000 (17:27 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8
Change-Id: I14bf21befe4489e808aba6c0f59fb92f58ee68fa
Android Build Merger (Role) [Wed, 30 May 2018 17:26:59 +0000 (17:26 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865
Change-Id: I70aa4efe7c58fddcca97197e73a1a6b439b7e94e
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)
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)
Android Build Merger (Role) [Wed, 30 May 2018 00:36:51 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d am:
f66eddbcb4
Change-Id: I39593f01bf46b3cf9d6c39242403beb07370032b
Android Build Merger (Role) [Wed, 30 May 2018 00:36:49 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d
Change-Id: Idd75518613dd8123342229f9d31a5ad6d9321e17
Android Build Merger (Role) [Wed, 30 May 2018 00:36:48 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467
Change-Id: I17fb1bc9fc1ee83746b0e4968e4656ba58c3c113
Android Build Merger (Role) [Wed, 30 May 2018 00:36:47 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
cf33d63af8 am:
9b0d9ee8fc am:
3df5904c55 skipped:
d61c73ca13 am:
81e4d7ca45 am:
e2efdf5c7c am:
6e62529383 am:
bfb627e982
Change-Id: If8370e6d5e5840c44d91d4d7b2fcd65687a78526
Android Build Merger (Role) [Wed, 30 May 2018 00:36:46 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807
Change-Id: Iacc5a09fa8f94ac3f8343b2ab7ff47a2c2e4f250
OSDN Git Service
