git.osdn.net Git - android-x86/system-bt.git/log

OSDN Git Service

(root) / android-x86 / system-bt.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)]

Merge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6 am: de43e591ab
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]

Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into nyc-mr2-dev

* changes:
  [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

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]

Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-mr2-dev

* changes:
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:24 +0000 (16:51 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6 am: de43e591ab

Change-Id: I270e23aa9c7718360f06c6e4ee58026f9b1c3056

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:22 +0000 (16:51 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6

Change-Id: Ia8a05230155e3dc89ee2c87dad2a3d32d609c7df

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:20 +0000 (16:51 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f

Change-Id: I8248ec75159250a70f991ee28a0889c75340f1aa

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:18 +0000 (16:51 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1

Change-Id: Ib7a1956032b8c363aaa47d249e6ec784c6690412

commit | commitdiff | tree

Hansong Zhang [Mon, 2 Apr 2018 16:29:49 +0000 (09:29 -0700)]

DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

Check the number of UUIDs from remote device

Bug: 74016921
Test: manual
Change-Id: I7e1fd420c96bdb4d8b1bb129eb85045f9e3da443

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:52 +0000 (21:31 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb am: c32084e577 am: b8387d01a6 am: 8d6e3ae442

Change-Id: I75c9eb9424724f9f0fff9136f8c054aa38d77ec6

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:50 +0000 (21:31 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb am: c32084e577 am: b8387d01a6

Change-Id: I3eaed8b4d5edaeb45609940536effe8f82c63caf

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:48 +0000 (21:31 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb am: c32084e577

Change-Id: I5efb619b0fa81ceff2dbf40cb86c6e9d92ca6483

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:46 +0000 (21:31 +0000)]

[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am: 07900311fb

Change-Id: I0e5e4ec71db8261994f64b1d1279b836b074762e

commit | commitdiff | tree

Ajay Panicker [Fri, 2 Feb 2018 08:56:43 +0000 (00:56 -0800)]

DO NOT MERGE: AVRCP: Check number of text attributes in response

Test: Build
Bug: 71603315
Change-Id: Ieda5e410057062533ae09bd977bfe7f758a55140

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:25 +0000 (07:52 +0000)]

[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c am: 27c7acb0ac am: 04674169fc am: 526bef5f59

Change-Id: I5ee00e53c6a4fa96625503ac1eddf75870e4c24f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:23 +0000 (07:52 +0000)]

[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c am: 27c7acb0ac am: 04674169fc

Change-Id: Id16ba673c11bb21522f8f240cc77211e33681ca1

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:22 +0000 (07:52 +0000)]

[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c am: 27c7acb0ac

Change-Id: Idb2c79340f8a89d7bda7215dc56d23a520b3c58f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:21 +0000 (07:52 +0000)]

[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am: aeff2c709c

Change-Id: I94a6b930f93c51f6a3b1e71929435c8bbcc49cb8

commit | commitdiff | tree

Ajay Panicker [Fri, 2 Feb 2018 09:26:34 +0000 (01:26 -0800)]

DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to

Test: Build
Bug: 71603553
Change-Id: I978270605cfaa3b833d6c19f1b1d2cd5a82ac079

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:41 +0000 (21:46 +0000)]

Merge "Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into cw-f-dev am: 836d07dd77" into nyc-mr2-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:45:59 +0000 (21:45 +0000)]

[automerger] Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am: c6f379e4f2 am: 9cbe0a31a3

Change-Id: I4463f4d0e21b62b49bf383e33356c7bcc4cc7868

commit | commitdiff | tree

Myles Watson [Wed, 7 Feb 2018 21:45:52 +0000 (21:45 +0000)]

Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into cw-f-dev
am: 836d07dd77

Change-Id: Ia4d97ae4be5d06e747af9a5066421341b2a2924e

commit | commitdiff | tree

Myles Watson [Wed, 7 Feb 2018 21:45:49 +0000 (21:45 +0000)]

Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev
am: c6f379e4f2

Change-Id: I21bf545d257a9f6142c173de869dbad766c804d6

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:58 +0000 (21:39 +0000)]

Merge "Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into cw-f-dev am: 09c96fcc30" into nyc-mr2-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]

Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev

* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727 am: b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]

Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into cw-f-dev

* changes:
  [automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727 am: b2f4b51041 am: a4c2f193e7
  [automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727 am: b2f4b51041
  Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]

Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev

* changes:
  [automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727 am: b2f4b51041 am: a4c2f193e7 am: 7781bec06e
  [automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727 am: b2f4b51041 am: a4c2f193e7
  [automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727 am: b2f4b51041
  Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:06 +0000 (21:39 +0000)]

[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727 am: b2f4b51041 am: a4c2f193e7 am: 7781bec06e

Change-Id: I8c52ee09952bb03da09418a86a7865070177fbdd

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:04 +0000 (21:39 +0000)]

[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727 am: b2f4b51041 am: a4c2f193e7

Change-Id: I6393804bc9845ac8cd3f62f38df52206dd62cbcc

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:03 +0000 (21:39 +0000)]

[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am: 87d9e19727 am: b2f4b51041

Change-Id: I5bb77085b74b30710f7c4eb41f4a183ee46ab37b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:55 +0000 (21:38 +0000)]

[automerger] Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-dr1-dev am: c1f1c627c8 am: 7bed084759 am: af3f55e2e2

Change-Id: I5930c000a4b9fb01d40ed611c1bd77efcda1b8f5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:54 +0000 (21:38 +0000)]

[automerger] Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-dr1-dev am: c1f1c627c8 am: 7bed084759

Change-Id: I4084cc2a26b76c3b95ca91b700463e0edfaf4a4d

commit | commitdiff | tree

Myles Watson [Wed, 7 Feb 2018 21:38:49 +0000 (21:38 +0000)]

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into cw-f-dev
am: 09c96fcc30

Change-Id: I97e8920d59b6f2e267e5407dfbd02b34e8cc0f10

commit | commitdiff | tree

Myles Watson [Wed, 7 Feb 2018 21:38:45 +0000 (21:38 +0000)]

Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev
am: 87d9e19727

Change-Id: If7db6b29ed6a842349b7070ec9692b2b1faeb0cd

commit | commitdiff | tree

Myles Watson [Wed, 7 Feb 2018 21:38:42 +0000 (21:38 +0000)]

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-dr1-dev
am: c1f1c627c8

Change-Id: I921df8b46b290f25ec3e3876f0669766ee035257

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:25 +0000 (21:38 +0000)]

[automerger] Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-mr1-dev am: 5666c37ad1 am: dfef16ff78

Change-Id: I9be8980f56bb4baf9b427e7390f5dbc2a9682dd2

commit | commitdiff | tree

Myles Watson [Wed, 7 Feb 2018 21:38:14 +0000 (21:38 +0000)]

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-mr1-dev
am: 5666c37ad1

Change-Id: Ib9f91cd05f2bca87756c033091c7fb6b237ff680

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]

Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea am: 6738c90bec
  [automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea
  DO NOT MERGE: SDP: Check p_req_end before reading from p_req

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea am: 6738c90bec am: 5d8bf075db am: 8604b579ec
  [automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea am: 6738c90bec am: 5d8bf075db
  [automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea am: 6738c90bec
  [automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea
  DO NOT MERGE: SDP: Check p_req_end before reading from p_req

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea am: 6738c90bec am: 5d8bf075db
  [automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea am: 6738c90bec
  [automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea
  DO NOT MERGE: SDP: Check p_req_end before reading from p_req

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:21 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a am: 8b680c2ac4 skipped: d2a6ebc407 am: 5a512bd29f am: 063e487cb1 am: 1170310876 am: 8e70cd4d15

Change-Id: Id62a6bf04ff44e2b2f28b3e318886907c25d6456

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:19 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a am: 8b680c2ac4 skipped: d2a6ebc407 am: 5a512bd29f am: 063e487cb1 am: 1170310876

Change-Id: Ic06dca7bd702f558399969217c3df23b9a43b14e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:18 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a am: 8b680c2ac4 skipped: d2a6ebc407 am: 5a512bd29f am: 063e487cb1

Change-Id: I6d3794a99a85aad5d1546b94b693db91a7d9adef

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:17 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a am: 8b680c2ac4 skipped: d2a6ebc407 am: 5a512bd29f

Change-Id: Ie69e1fd2e30742edc770e58d62c142692914b873

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:16 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a am: 8b680c2ac4 skipped: d2a6ebc407

Change-Id: Iae89be86bc20908521d2c99a099f8728c4e9f820

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:15 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a am: 8b680c2ac4

Change-Id: Iaec135fc10b631d0ba46467ba71692f8a60e477c

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.