OSDN Git Service

android-x86/system-bt.git
6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
Android Build Merger (Role) [Mon, 9 Apr 2018 16:36:49 +0000 (16:36 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f am: 775e7073a4

Change-Id: Ie5ecd3833698fbe2b5ad807429598f426301604c

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
Android Build Merger (Role) [Mon, 9 Apr 2018 16:36:46 +0000 (16:36 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a am: d618664a5f

Change-Id: Ic54a4c7f7bbb567d01caa25734e026d245db86f5

6 years ago[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am:...
Android Build Merger (Role) [Mon, 9 Apr 2018 16:36:43 +0000 (16:36 +0000)]
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: 810e669d7a

Change-Id: I5df75e382fe9438aad5896d60d5697f21f0a140d

6 years agoDO NOT MERGE Handle bad packet length in gatts_process_read_req
Stanley Tng [Thu, 5 Apr 2018 16:54:13 +0000 (09:54 -0700)]
DO NOT MERGE Handle bad packet length in gatts_process_read_req

Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Please note that there is another earlier CL that is reverted and this
is the updated one.

Bug: 73172115
Test: Run the test program, poc, that was attached in the bug report
Merged-In: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
Change-Id: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
(cherry picked from commit cc9c7330d1c3507d745170ae7b2e0546197b7acb)

6 years agoMerge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into cw-f-dev
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into cw-f-dev

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

6 years agoMerge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into nyc-mr1-dev
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-mr1-dev

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

6 years agoMerge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into nyc-dr1-dev
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-dr1-dev

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

6 years agoMerge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into nyc-dev
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into nyc-dev

6 years agoMerge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into cw-f-dev
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into cw-f-dev

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

6 years agoMerge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-mr1-dev
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-mr1-dev

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

6 years agoMerge changes from topic "am-052c6ecb-b5c1-4a10-9d60-0251d0e6f8d6" into nyc-dr1-dev
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-dr1-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58
  DO NOT MERGE Fix unexpected behavior in smp_sm_event

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into nyc-dev
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into nyc-dev

6 years ago[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab...
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

6 years ago[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab...
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

6 years ago[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am: 235eab9efd
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

6 years agoDO NOT MERGE Drop LE CoC fragments when frame size is too big
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74
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

6 years agoDO NOT MERGE Fix unexpected behavior in smp_sm_event
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58...
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58...
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

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 61c9430c58
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

6 years agoDO NOT MERGE Fix unexpected behavior in smp_sm_event
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response...
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

6 years agoDO NOT MERGE: AVRCP: Check number of text attribute values in response
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

6 years agoMerge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into cw-f-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 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

6 years agoMerge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into nyc-mr1-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-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

6 years agoMerge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into nyc-dr1-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-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

6 years agoMerge "DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written...
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

6 years agoMerge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into cw-f-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 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

6 years agoMerge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into nyc-mr1-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 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

6 years agoMerge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into nyc-dr1-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 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

6 years agoMerge "DO NOT MERGE: AVRCP: Check number of text attributes in response" into nyc-dev
TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: AVRCP: Check number of text attributes in response" into nyc-dev

6 years agoMerge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into cw...
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

6 years agoMerge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into nyc...
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

6 years agoMerge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into nyc...
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

6 years agoMerge "DO NOT MERGE Truncate new line characters when adding string to config" into...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years agoDO NOT MERGE Truncate new line characters when adding string to config
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years agoDO NOT MERGE Truncate new line characters when adding string to config
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am...
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

6 years agoDO NOT MERGE: AVRCP: Check number of text attributes in response
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be writte...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be writte...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be writte...
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

6 years agoDO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
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

6 years agoMerge changes from topic "am-123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev
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

6 years agoMerge changes from topic "am-123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev
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

6 years agoMerge changes from topic "am-123d1192465c41d68296e6dc685616c6" into cw-f-dev
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

6 years ago[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req...
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

6 years ago[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req...
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

6 years ago[automerger] Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into...
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

6 years agoMerge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev
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

6 years agoMerge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-dr1-dev
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

6 years agoMerge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-mr1-dev
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

6 years agoMerge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev
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

6 years agoMerge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-mr1-dev
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

6 years agoMerge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into nyc-dr1-dev
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

6 years agoMerge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into cw-f-dev
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

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf...
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

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf...
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

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf...
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

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf...
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

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf...
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

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf...
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:13 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a

Change-Id: Idde655e8a3377560317189bbc49620670c5923c8

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:12 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4

Change-Id: I2462f1128b027a515b616beb005c879e6d372f27

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13...
Android Build Merger (Role) [Wed, 7 Feb 2018 20:08:21 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea am: 6738c90bec am: 5d8bf075db

Change-Id: I312ef4feec2eb5f14d33315824f49ee0c80978f3

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13...
Android Build Merger (Role) [Wed, 7 Feb 2018 20:08:19 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea am: 6738c90bec

Change-Id: I312edefb3dde4b9124c2426d93c6de1a20d714f4

6 years ago[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea
Android Build Merger (Role) [Wed, 7 Feb 2018 20:08:18 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: d321b13fea

Change-Id: I38fe9031785ca2476280a03c1510781e0750f9da

6 years agoDO NOT MERGE: SDP: Check p_req_end before reading from p_req
Myles Watson [Fri, 12 Jan 2018 01:43:40 +0000 (17:43 -0800)]
DO NOT MERGE: SDP: Check p_req_end before reading from p_req

Bug: 69384124
Test: Connect a headset
Change-Id: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe

6 years agoDO NOT MERGE: SDP: Check p_req_end before reading from p_req
Myles Watson [Fri, 12 Jan 2018 01:43:40 +0000 (17:43 -0800)]
DO NOT MERGE: SDP: Check p_req_end before reading from p_req

Bug: 69384124
Test: Connect a headset
Change-Id: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe

6 years agoMerge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4...
Myles Watson [Tue, 16 Jan 2018 18:28:28 +0000 (18:28 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4 am: 1f573b136d am: 1c4f74e02c am: 0f9c39d5cd am: 510601cbb4 am: b92debbd19
am: 0e69fe96e7

Change-Id: I1cf83ae6e68124da3afc3f8fc7884d3e12587b80

6 years agoMerge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4...
Myles Watson [Tue, 16 Jan 2018 18:24:21 +0000 (18:24 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4 am: 1f573b136d am: 1c4f74e02c am: 0f9c39d5cd am: 510601cbb4
am: b92debbd19

Change-Id: I4e66566e973a8443537f85715dcd9a18ae639d07

6 years agoMerge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4...
Myles Watson [Tue, 16 Jan 2018 18:12:53 +0000 (18:12 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4 am: 1f573b136d am: 1c4f74e02c am: 0f9c39d5cd
am: 510601cbb4

Change-Id: I95f12990cbc975453460aa18ab125bf571add95d

6 years agoMerge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4...
Myles Watson [Tue, 16 Jan 2018 18:08:23 +0000 (18:08 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4 am: 1f573b136d am: 1c4f74e02c
am: 0f9c39d5cd

Change-Id: I56a016ee9e1459472e97a341b8cbc9b8253b230b

6 years agoMerge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4...
Myles Watson [Tue, 16 Jan 2018 18:03:20 +0000 (18:03 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4 am: 1f573b136d
am: 1c4f74e02c

Change-Id: I160dce825ef9490fea2c9614472d4bb2477cfb40

6 years agoMerge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4
Myles Watson [Tue, 16 Jan 2018 17:58:18 +0000 (17:58 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4
am: 1f573b136d

Change-Id: I2d2d968c09bc690ec03ee54a1a4060ef2ba71eac

6 years agoMerge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
Myles Watson [Tue, 16 Jan 2018 17:53:49 +0000 (17:53 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
am: f3c40264c4

Change-Id: I22c76d476befb51d5e8b8c1d5557e711d8949507

6 years agoMerge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
TreeHugger Robot [Tue, 16 Jan 2018 17:46:17 +0000 (17:46 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev

6 years agoMerge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc...
Ajay Panicker [Sat, 13 Jan 2018 02:17:01 +0000 (02:17 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am: 4207e26df6 am: 9f936a8699 am: 45490dc0b4 am: 786be83578  -s ours am: 66cda0073a am: f9d07e37fa
am: 2a8638c939

Change-Id: Icc24d0d12d7d435491bf2941608c40fddb959834

6 years agoMerge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc...
Ajay Panicker [Sat, 13 Jan 2018 02:09:42 +0000 (02:09 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am: 4207e26df6 am: 9f936a8699 am: 45490dc0b4 am: 786be83578  -s ours am: 66cda0073a
am: f9d07e37fa

Change-Id: I9860cc0aca5bba8682babfc64a9751cd547ede8f

6 years agoMerge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc...
Ajay Panicker [Sat, 13 Jan 2018 02:03:56 +0000 (02:03 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am: 4207e26df6 am: 9f936a8699 am: 45490dc0b4 am: 786be83578  -s ours
am: 66cda0073a

Change-Id: I6d65606a09c8b1dba7bb5d23e4463af534abf852