OSDN Git Service
Hansong Zhang [Fri, 6 Apr 2018 23:57:25 +0000 (16:57 -0700)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev am:
9837db006d
am:
4bdf63c191
Change-Id: I1cf0ee2f23638ead504ac56f8d5964c0a7ddf1e4
Hansong Zhang [Fri, 6 Apr 2018 23:52:54 +0000 (16:52 -0700)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev
am:
9837db006d
Change-Id: I838951d04e7dc02ae37ba01644d7e32006cc1285
TreeHugger Robot [Fri, 6 Apr 2018 23:41:24 +0000 (23:41 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev
Stanley Tng [Fri, 6 Apr 2018 22:47:54 +0000 (15:47 -0700)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into oc-dev am:
93b9a1a85c
am:
616818d5c9
Change-Id: I1b79cbb693c3aaae016af04816dc7173348241de
Hansong Zhang [Fri, 6 Apr 2018 22:47:28 +0000 (15:47 -0700)]
Merge changes from topic "am-
052c6ecb-b5c1-4a10-9d60-
0251d0e6f8d6" into oc-dev am:
7d2623a4ad
am:
3eaed2cf81
Change-Id: Ida9bffe6ee50911ff20f1a41d431205b30b34cf1
Stanley Tng [Fri, 6 Apr 2018 22:45:33 +0000 (15:45 -0700)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into oc-dev
am:
93b9a1a85c
Change-Id: I603447db4f8bc1d411368fe41b257f29e3071ce9
Hansong Zhang [Fri, 6 Apr 2018 22:44:35 +0000 (15:44 -0700)]
Merge changes from topic "am-
052c6ecb-b5c1-4a10-9d60-
0251d0e6f8d6" into oc-dev
am:
7d2623a4ad
Change-Id: I7bab25cad1ad7d8d70db8dcf3c5c00fdb3638c67
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into oc-dev
* changes:
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893 am:
a29c667c1a skipped:
9e5aa5c98f
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893 am:
a29c667c1a
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd
DO NOT MERGE Drop LE CoC fragments when frame size is too big
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge changes from topic "am-
052c6ecb-b5c1-4a10-9d60-
0251d0e6f8d6" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22 am:
bd4d802773 skipped:
78dcd6eee6
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22 am:
bd4d802773
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58
DO NOT MERGE Fix unexpected behavior in smp_sm_event
Hansong Zhang [Fri, 6 Apr 2018 22:23:27 +0000 (15:23 -0700)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464 am:
7fa0bf6106 skipped:
6f49839d7b am:
0aaeaf661c
am:
5a8cb7a3d8
Change-Id: Idc2c79cf42aa59916996e4e1cfaefa1c029855d1
Hansong Zhang [Fri, 6 Apr 2018 22:18:48 +0000 (15:18 -0700)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464 am:
7fa0bf6106 skipped:
6f49839d7b
am:
0aaeaf661c
Change-Id: Ibcc5d6fc270ecc52ab3c2bc1e161fbd528ae51a5
Android Build Merger (Role) [Thu, 5 Apr 2018 00:07:04 +0000 (00:07 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893 am:
a29c667c1a skipped:
9e5aa5c98f
Change-Id: I3bdb8e4f5defef9034e4b3d86412b1ae738095e3
Android Build Merger (Role) [Thu, 5 Apr 2018 00:07:02 +0000 (00:07 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893 am:
a29c667c1a
Change-Id: I02e4726181241715843b48e7d4f06b962b434438
Android Build Merger (Role) [Thu, 5 Apr 2018 00:07:01 +0000 (00:07 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893
Change-Id: I098a1f34ba3e5dd419bb019b643e5ae22d8fbb63
Android Build Merger (Role) [Thu, 5 Apr 2018 00:06:59 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256
Change-Id: I0396a059146eab90983a49b846bc86c1905a8f20
Android Build Merger (Role) [Thu, 5 Apr 2018 00:06:57 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd
Change-Id: I0b963de5871e4bf4c8fb8115376e1badc9c06803
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
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:32 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464 am:
7fa0bf6106 skipped:
6f49839d7b
Change-Id: I34bc2e4a1ffaddaa715d6ca93702bf71d041141a
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:30 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464 am:
7fa0bf6106
Change-Id: I1abe8e714705eb6c74608c2e608c7dc747b175f1
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:29 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464
Change-Id: Ia05aec96a9297845ed8f998f34507faf2eb562aa
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:27 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12
Change-Id: I2d9e1e774d5694163049a52119fbd67b1ac4b718
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:26 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c
Change-Id: Ic8a22969dc8b52582eea14f731c00cf0463bd024
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
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:20 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22 am:
bd4d802773 skipped:
78dcd6eee6
Change-Id: I022d88a5ca99ce2e062fe7841f26fba5971f463b
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:18 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22 am:
bd4d802773
Change-Id: Ice42267f2191bbf8e78f9b85863ea0bc850cc99f
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:17 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22
Change-Id: I0277e517cae82234c8ae069c6dd63c5490ece5fe
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:15 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213
Change-Id: Idc62cb9586d417c7ec8fee25810d6ca93747265c
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:13 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58
Change-Id: I4bec7ca811e03099ce24a284ebd9fa580a18fa23
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:27:37 +0000 (16:27 -0700)]
DO NOT MERGE Fix unexpected behavior in smp_sm_event
Bug:
74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53
Ajay Panicker [Tue, 13 Feb 2018 00:52:17 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am:
8a6fb36884 am:
d4b8f56f02 am:
bde10cf7d9 am:
3fa6938ad7 skipped:
99b48162a3 am:
ba32c74024
am:
7dd32564e9
Change-Id: I97f21e6c5e4a15ec8c0e630661a2166e07e2056c
Ajay Panicker [Tue, 13 Feb 2018 00:45:03 +0000 (00:45 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am:
8a6fb36884 am:
d4b8f56f02 am:
bde10cf7d9 am:
3fa6938ad7 skipped:
99b48162a3
am:
ba32c74024
Change-Id: I2d64b0ca170d70f194315ee831379477c809fe95
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:29 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am:
8a6fb36884 am:
d4b8f56f02 am:
bde10cf7d9 am:
3fa6938ad7 skipped:
99b48162a3
Change-Id: I3a030575253b8e4ef8ce8fb9e8302c84584809f8
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:26 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am:
8a6fb36884 am:
d4b8f56f02 am:
bde10cf7d9 am:
3fa6938ad7
Change-Id: I393094413a4eb635cd80aaa7b7dc74fac8e5dbc0
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:23 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am:
8a6fb36884 am:
d4b8f56f02 am:
bde10cf7d9
Change-Id: Ic0722cf7a7ca48da60055a050fcb8f924fb18f13
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:20 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am:
8a6fb36884 am:
d4b8f56f02
Change-Id: I7d25a311a384582bbe03a7f6d7076ba07788b30a
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:17 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am:
8a6fb36884
Change-Id: I895844919dbff48a2290b717974cd76b58da541b
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
Ajay Panicker [Mon, 12 Feb 2018 20:26:30 +0000 (20:26 +0000)]
Merge "AVRCP: Check number of text attribute values in response" into oc-dev am:
49dd35ac08
am:
fc2245221c
Change-Id: I75217c8ffd406ba1660e3ddf7781b95a9f612167
Ajay Panicker [Mon, 12 Feb 2018 20:20:24 +0000 (20:20 +0000)]
Merge "AVRCP: Check number of text attribute values in response" into oc-dev
am:
49dd35ac08
Change-Id: Ic7c84b59fcb22988d8f2cbdc1ee214281d10875d
TreeHugger Robot [Mon, 12 Feb 2018 20:05:21 +0000 (20:05 +0000)]
Merge "AVRCP: Check number of text attribute values in response" into oc-dev
Ajay Panicker [Mon, 12 Feb 2018 19:30:11 +0000 (19:30 +0000)]
Merge "AVRCP: Set maximum string length when copying to buffer" into oc-dev am:
d6836f1dae
am:
6eecab97ed
Change-Id: I52ebf76468434f8f35163eb1822ac1602878eb04
Ajay Panicker [Mon, 12 Feb 2018 19:29:45 +0000 (19:29 +0000)]
Merge "AVRCP: Initialize buffer for attribute values to be written to" into oc-dev am:
26eabd77c5
am:
78471a174a
Change-Id: I9726ffa57071c338423f5b81e3d8b364be62ca77
Ajay Panicker [Mon, 12 Feb 2018 19:29:21 +0000 (19:29 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into oc-dev am:
b8cc52c403
am:
92e778f7d5
Change-Id: I3eee3fc6088fabbb4319d1a0cb52274e90071eb1
Ajay Panicker [Mon, 12 Feb 2018 19:28:45 +0000 (19:28 +0000)]
Merge "AVRCP: Check number of text attributes in response" into oc-dev am:
ea8da12040
am:
1af6fff159
Change-Id: I11e6e3f5e947f07f81d99e491a293ee47228f531
Ajay Panicker [Mon, 12 Feb 2018 19:28:14 +0000 (19:28 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into oc-dev am:
142e752125
am:
9174514369
Change-Id: I46de8fc18a64c114b3aadda9bbadff2e6cb76c88
Ajay Panicker [Mon, 12 Feb 2018 19:24:22 +0000 (19:24 +0000)]
Merge "AVRCP: Set maximum string length when copying to buffer" into oc-dev
am:
d6836f1dae
Change-Id: I3c1f67e53bfcd0b202fab9ecaaefc0eb413c0b67
Ajay Panicker [Mon, 12 Feb 2018 19:23:54 +0000 (19:23 +0000)]
Merge "AVRCP: Initialize buffer for attribute values to be written to" into oc-dev
am:
26eabd77c5
Change-Id: Id0a63e1862d8744e1f90b37f13d2bd421545554f
Ajay Panicker [Mon, 12 Feb 2018 19:22:39 +0000 (19:22 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into oc-dev
am:
b8cc52c403
Change-Id: I3ef7630ba095f9aedde9ee4e7f16397e06041dc2
Ajay Panicker [Mon, 12 Feb 2018 19:21:16 +0000 (19:21 +0000)]
Merge "AVRCP: Check number of text attributes in response" into oc-dev
am:
ea8da12040
Change-Id: If719d0b402fd0fcaa40a890b34eca6f89fa92aca
Ajay Panicker [Mon, 12 Feb 2018 19:20:20 +0000 (19:20 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into oc-dev
am:
142e752125
Change-Id: I097d61047d05db7daf8d4142f0a57fa8536fa806
TreeHugger Robot [Mon, 12 Feb 2018 19:04:19 +0000 (19:04 +0000)]
Merge "AVRCP: Set maximum string length when copying to buffer" into oc-dev
TreeHugger Robot [Mon, 12 Feb 2018 19:03:59 +0000 (19:03 +0000)]
Merge "AVRCP: Initialize buffer for attribute values to be written to" into oc-dev
TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc am:
526bef5f59
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c
DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c
DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c
DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c
DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
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:46 +0000 (19:03 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into oc-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc am:
526bef5f59 skipped:
36a9e6b339
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc am:
526bef5f59
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c
DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
TreeHugger Robot [Mon, 12 Feb 2018 19:03:19 +0000 (19:03 +0000)]
Merge "AVRCP: Check number of text attributes in response" into oc-dev
TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into oc-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6 am:
8d6e3ae442 skipped:
af6bae18a9
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6 am:
8d6e3ae442
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb
DO NOT MERGE: AVRCP: Check number of text attributes in response
TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6 am:
8d6e3ae442
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb
DO NOT MERGE: AVRCP: Check number of text attributes in response
TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb
DO NOT MERGE: AVRCP: Check number of text attributes in response
TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb
DO NOT MERGE: AVRCP: Check number of text attributes in response
TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb
DO NOT MERGE: AVRCP: Check number of text attributes in response
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
Hansong Zhang [Sat, 10 Feb 2018 19:31:23 +0000 (19:31 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev am:
37f93de090
am:
8464a40d75
Change-Id: Id79a1f421f7a88ccabde0b99af0e5ca32d3b68d0
Hansong Zhang [Sat, 10 Feb 2018 19:30:59 +0000 (19:30 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev am:
5e84bac2be
am:
269eff697d
Change-Id: I11ba57b3e8826a0ed272286105e3262be732d849
Hansong Zhang [Sat, 10 Feb 2018 19:30:30 +0000 (19:30 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93 am:
c7f5875cf9
am:
a082cc20a9
Change-Id: I911f81a88ff9be580e1440f1c21e039ba92c394c
Hansong Zhang [Sat, 10 Feb 2018 19:27:01 +0000 (19:27 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev
am:
37f93de090
Change-Id: I9264e3749d75853a97654472216d684c9c71c9ef
Hansong Zhang [Sat, 10 Feb 2018 19:26:35 +0000 (19:26 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev
am:
5e84bac2be
Change-Id: I81f3556dc26164969361764f7877635be5010b0a
Hansong Zhang [Sat, 10 Feb 2018 19:25:58 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93
am:
c7f5875cf9
Change-Id: I4e8651a4b09314c5df7090009a28752a5661bd32
TreeHugger Robot [Sat, 10 Feb 2018 19:18:10 +0000 (19:18 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev
TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
DO NOT MERGE Truncate new line characters when adding string to config
TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into cw-f-dev
* changes:
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
DO NOT MERGE Truncate new line characters when adding string to config
TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
DO NOT MERGE Truncate new line characters when adding string to config
TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
DO NOT MERGE Truncate new line characters when adding string to config
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
TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f skipped:
f83e8e01f1
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
DO NOT MERGE Truncate new line characters when adding string to config
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:08 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f skipped:
f83e8e01f1
Change-Id: I4456e0ddf8aa91bba685033d4e9403bec83bee07
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:06 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f
Change-Id: I2764200ea03a976eb679b4e02c4ece61115b1861
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:05 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e
Change-Id: If09082226b692af642ce8e1f312e9adb6e0280a6
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:04 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18
Change-Id: I2816fd435f6ffc4366ca02ad5a0beb8d9d795569
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:03 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
Change-Id: I3d96331b5aa30717f8e6be3c5fe3a91053e69cee
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:51 +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 am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93
Change-Id: If62106b8704dbebc76e94851a6c63a3ab2072f6f
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:50 +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 am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44
Change-Id: I2a658c40f43846b7e261233b1e1fb2db4691f9d6
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:48 +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 am:
f4e92b98bb am:
49838a27e2 am:
119a768af6
Change-Id: I606382f75f3ef671f4b651b2396f918a2e97d162
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:47 +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 am:
f4e92b98bb am:
49838a27e2
Change-Id: I35a049b455aa485a29778f3609cc026952975484
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:46 +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 am:
f4e92b98bb
Change-Id: I051f65fd35d9cfc6329dc072fb37ab5b3820de93
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
Hansong Zhang [Fri, 9 Feb 2018 22:16:59 +0000 (14:16 -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: I8729e12ad5851ee1ffbcb7c08e9a659f768ffc21
OSDN Git Service
