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

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

Hansong Zhang [Mon, 9 Apr 2018 20:48:15 +0000 (13:48 -0700)]

Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into oc-dev
am: b1a0889f76

Change-Id: Icc21ee9eebce0056dc6885f23874aee889f2cede

commit | commitdiff | tree

Hansong Zhang [Mon, 9 Apr 2018 20:47:46 +0000 (13:47 -0700)]

Merge changes from topic "am-67cc014c-1372-4bfa-8272-45a792f72a05" into oc-dev
am: 8216545fcb

Change-Id: I3b4cb5886d4d5223d7c9a79ac59e8714189cf3f8

commit | commitdiff | tree

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

Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into oc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5 am: 05a0d17de2 skipped: 6a6eadc2e4
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5 am: 05a0d17de2
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

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 oc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: f55b3093f1 am: dbe2d9451f am: 11fb9e98f6 am: de43e591ab skipped: d37abe6045
  [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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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 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

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 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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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:58:46 +0000 (16:58 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5 am: 05a0d17de2 skipped: 6a6eadc2e4

Change-Id: I41bc6f3077c08e0e5bafa0af9844d2ac0260ed59

commit | commitdiff | tree

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

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5 am: 05a0d17de2

Change-Id: Icc2caeff1b265b54b06d40d7202d7be407b08e5c

commit | commitdiff | tree

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

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0 am: ae857fb5d5

Change-Id: I8b7d25413a505d9ef3989e3d36607a7c83ff99e6

commit | commitdiff | tree

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

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61 am: 0592daaae0

Change-Id: I4ff82057f6e839a8941becb5566555fb1d8f78a5

commit | commitdiff | tree

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

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b am: 463584ae61

Change-Id: I3f3d68bac43d0a4673a4b21b1801da79f7841b53

commit | commitdiff | tree

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

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b

Change-Id: I30ae8f458e18a4b4fb2c8457dca65ce68307cf46

commit | commitdiff | tree

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

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9

Change-Id: I9d0d9847904b361d457bba6b0f7dba6db9e6e10a

commit | commitdiff | tree

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

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874

Change-Id: I4560a77109abd6772f9a7ef7808d073699e23dc5

commit | commitdiff | tree

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

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

Change-Id: I45246189f80aedb86c70064d85006ac8f5ba00ac

commit | commitdiff | tree

Hansong Zhang [Mon, 2 Apr 2018 16:55:58 +0000 (09:55 -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: I5d3a90bad63af5b22dd155f1d60869b8149d350c

commit | commitdiff | tree

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

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

Change-Id: Ic2890b5dd52734710fe57b5da68129245c561852

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: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

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: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

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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: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

commit | commitdiff | tree

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

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 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

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree