OSDN Git Service
Atanas Kirilov [Fri, 1 Jun 2018 06:45:35 +0000 (23:45 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into oc-dev am:
198c72a4a1 am:
3de1b53878 am:
e15e4b5e42 -s ours
am:
a66f82b822
Change-Id: If6c5564ac286698333bb46f708bd3928f20ede84
Atanas Kirilov [Fri, 1 Jun 2018 06:40:27 +0000 (23:40 -0700)]
Merge changes from topic "am-
94f6d099-67a7-4fc1-95d1-
65272646c688" into oc-dev am:
f8075ee202 am:
b80b8d4e95 am:
9aee210ccf
am:
51b64346ef
Change-Id: Id0173d279e881bae65ffdffcf030247d33615c62
Atanas Kirilov [Fri, 1 Jun 2018 06:37:32 +0000 (23:37 -0700)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into oc-dev am:
1825f64fed am:
2858be43cc am:
1e8042a2fd
am:
3820c3c0c9
Change-Id: I49e74570b66f8c73fa778a20ac6cb23679f90876
Myles Watson [Fri, 1 Jun 2018 06:29:14 +0000 (23:29 -0700)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into oc-dev am:
bef69c5242 am:
3864be913c am:
4af0e3b940 -s ours
am:
31f0027e75
Change-Id: Iff0320ac44eb8f800c157999fe946a5562796c47
Myles Watson [Fri, 1 Jun 2018 06:26:20 +0000 (23:26 -0700)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff-nyc-dev" into oc-dev am:
bf322b5333 am:
67d5edbfb1 am:
d5158f176c
am:
b04e2df766
Change-Id: I4b8b6ee2c2c40031b6f6da8dfdfce751f79d189d
Myles Watson [Fri, 1 Jun 2018 06:21:23 +0000 (23:21 -0700)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into oc-dev am:
d1305de35a am:
6d40208ab2 am:
95ec9c9b65
am:
4eaa573d04
Change-Id: Ife7ecf3bb9830c615d42947bc0ec40ac27fb5836
Jakub Pawlowski [Fri, 1 Jun 2018 06:11:15 +0000 (23:11 -0700)]
Merge "Decrease length after reading from array in process_service_attr_req" into oc-dev am:
ea5db7d0dd am:
409b40eb84 am:
cbda25c0fa
am:
e09d86b463
Change-Id: I8364f3aca8a41f4837b2957b512d0770be725841
Hansong Zhang [Fri, 1 Jun 2018 03:23:05 +0000 (20:23 -0700)]
AVRCP: Reject invalid PlayItem and SetAddressedPlayer command am:
c2f06bd7cd
am:
fbd5aa9116
Change-Id: I1510c9dd5eb7fbdf5d51523e7c577ea70e3b77ef
Atanas Kirilov [Fri, 1 Jun 2018 02:14:04 +0000 (19:14 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into oc-dev am:
198c72a4a1 am:
3de1b53878
am:
e15e4b5e42 -s ours
Change-Id: I31a4bebfdc5df379167a8e3bf56918c20417034f
Atanas Kirilov [Fri, 1 Jun 2018 02:09:53 +0000 (19:09 -0700)]
Merge changes from topic "am-
94f6d099-67a7-4fc1-95d1-
65272646c688" into oc-dev am:
f8075ee202 am:
b80b8d4e95
am:
9aee210ccf
Change-Id: I6f1d25e7736da21c58604978f6b393e70794f257
Atanas Kirilov [Fri, 1 Jun 2018 02:05:06 +0000 (19:05 -0700)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into oc-dev am:
1825f64fed am:
2858be43cc
am:
1e8042a2fd
Change-Id: Id76c50b33bc2949acb61565145e2fd4a09a1777b
Myles Watson [Fri, 1 Jun 2018 01:57:49 +0000 (18:57 -0700)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into oc-dev am:
bef69c5242 am:
3864be913c
am:
4af0e3b940 -s ours
Change-Id: I50544f88c699ac5a242e2d4da7eef85c6c075e1e
Myles Watson [Fri, 1 Jun 2018 01:54:29 +0000 (18:54 -0700)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff-nyc-dev" into oc-dev am:
bf322b5333 am:
67d5edbfb1
am:
d5158f176c
Change-Id: I8892c0832b4b1f264a9cb81f7b6486b8203ea3d3
Myles Watson [Fri, 1 Jun 2018 01:38:16 +0000 (18:38 -0700)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into oc-dev am:
d1305de35a am:
6d40208ab2
am:
95ec9c9b65
Change-Id: I0da6e478280900ddb2782660f7c00a3a40f4aceb
Jakub Pawlowski [Fri, 1 Jun 2018 01:33:55 +0000 (18:33 -0700)]
Merge "Decrease length after reading from array in process_service_attr_req" into oc-dev am:
ea5db7d0dd am:
409b40eb84
am:
cbda25c0fa
Change-Id: Id6152ac454552e852bdb4a87c90c7a7bb78778e4
Atanas Kirilov [Fri, 1 Jun 2018 00:59:13 +0000 (17:59 -0700)]
Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into oc-dev am:
198c72a4a1
am:
3de1b53878
Change-Id: I5a765b1c957e29160b70ed17232ea24b859f9931
Atanas Kirilov [Fri, 1 Jun 2018 00:58:45 +0000 (17:58 -0700)]
Merge changes from topic "am-
94f6d099-67a7-4fc1-95d1-
65272646c688" into oc-dev am:
f8075ee202
am:
b80b8d4e95
Change-Id: I28fad6ee606861a4bab6a5a474348744c3da0f59
Hansong Zhang [Fri, 1 Jun 2018 00:29:06 +0000 (17:29 -0700)]
AVRCP: Reject invalid PlayItem and SetAddressedPlayer command
am:
c2f06bd7cd
Change-Id: I4909911afd83dd2d0b9ffac5a899098ff50405b2
Hansong Zhang [Fri, 1 Jun 2018 00:24:31 +0000 (17:24 -0700)]
[automerger skipped] Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc-dev am:
68e7c87d93 am:
872abf0d70 am:
45249aaaca -s ours
am:
9c32254644
Change-Id: I8531cfc15a685256783df55d4fd1175ae69fcb47
Hansong Zhang [Fri, 1 Jun 2018 00:24:01 +0000 (17:24 -0700)]
Merge changes from topic "am-
5821813f-624a-468d-ae05-
8b2918b15c74-nyc-dev" into oc-dev am:
e0863fe41e am:
5d0975d788 am:
7c0d1d7016
am:
157799bc06
Change-Id: I7376ff6ab6316e93b273a4ec050da117e0028f5d
Hansong Zhang [Fri, 1 Jun 2018 00:22:16 +0000 (17:22 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
cf33d63af8 am:
9b0d9ee8fc am:
3df5904c55 skipped:
d61c73ca13 am:
81e4d7ca45 am:
e2efdf5c7c am:
6e62529383 am:
bfb627e982 skipped:
573c0521e8 am:
5767c158dc am:
b77d2d0e6f am:
6a5fe4c62a -s ours
am:
4e5c587b40
Change-Id: I8f89b3444f19785c94ff8a4a8392ac5b7b5ac227
Myles Watson [Fri, 1 Jun 2018 00:20:36 +0000 (17:20 -0700)]
Merge "SDP: Recalculate param_len after max_list_len" into pi-dev
am:
3070bd8f1c
Change-Id: I18462743110b0eb1c4d36a774fb7e4efe2ffc92b
Atanas Kirilov [Fri, 1 Jun 2018 00:19:35 +0000 (17:19 -0700)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into oc-dev am:
1825f64fed
am:
2858be43cc
Change-Id: I238ee7607edf77564dfbbc98c704c60cce568336
Andre Eisenbach [Fri, 1 Jun 2018 00:17:53 +0000 (17:17 -0700)]
Merge "AVRCP: Reject invalid PlayItem and SetAddressedPlayer command" into pi-dev
am:
1573be5309
Change-Id: Ie7b3d849f08b783099601fd7837aeb38414ac94f
Myles Watson [Fri, 1 Jun 2018 00:15:24 +0000 (17:15 -0700)]
Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into oc-dev am:
bef69c5242
am:
3864be913c
Change-Id: I81fc1c6e2251454ea7a50e1a8cc2c6bc691b2127
Myles Watson [Fri, 1 Jun 2018 00:10:45 +0000 (17:10 -0700)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff-nyc-dev" into oc-dev am:
bf322b5333
am:
67d5edbfb1
Change-Id: I8622347df6222961a915615dda134a7cfb88c4c5
Myles Watson [Fri, 1 Jun 2018 00:08:36 +0000 (17:08 -0700)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into oc-dev am:
d1305de35a
am:
6d40208ab2
Change-Id: I7effb72d31fa281e177fcbf56aa6724fbecda02e
Hansong Zhang [Fri, 1 Jun 2018 00:06:41 +0000 (17:06 -0700)]
Merge "SMP: Check p_cb->role in smp_br_state_machine_event" into pi-dev
am:
09c3f838e4
Change-Id: I80fad4c9814f3bed33112a97e7eaf0d63e39ab96
Jakub Pawlowski [Fri, 1 Jun 2018 00:04:23 +0000 (17:04 -0700)]
Merge "Decrease length after reading from array in process_service_attr_req" into oc-dev am:
ea5db7d0dd
am:
409b40eb84
Change-Id: I2aef62db7ff8f477c71c94573385a5ffef2b73cf
Atanas Kirilov [Fri, 1 Jun 2018 00:01:36 +0000 (17:01 -0700)]
Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into oc-dev
am:
198c72a4a1
Change-Id: I31a10f2c1efd64c514f637af2691688276aefbcf
Atanas Kirilov [Fri, 1 Jun 2018 00:01:15 +0000 (17:01 -0700)]
Merge changes from topic "am-
94f6d099-67a7-4fc1-95d1-
65272646c688" into oc-dev
am:
f8075ee202
Change-Id: I6b6021bcd6c1df0f1be34912cee13ba448890105
Atanas Kirilov [Fri, 1 Jun 2018 00:00:41 +0000 (17:00 -0700)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into oc-dev
am:
1825f64fed
Change-Id: I970ec8ca35f66971985518866bc85cf5262089bd
Myles Watson [Fri, 1 Jun 2018 00:00:03 +0000 (17:00 -0700)]
Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into oc-dev
am:
bef69c5242
Change-Id: Ib42e206cdeae17b1d417ee29d563037379bec9e2
Myles Watson [Thu, 31 May 2018 23:59:41 +0000 (16:59 -0700)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff-nyc-dev" into oc-dev
am:
bf322b5333
Change-Id: I35d221327cb3fdee665b32cf2ccce77124e811d7
Myles Watson [Thu, 31 May 2018 23:59:03 +0000 (16:59 -0700)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into oc-dev
am:
d1305de35a
Change-Id: I1ee0e824ef5fdf2e434a6505bc25ab026472151e
Jakub Pawlowski [Thu, 31 May 2018 23:47:19 +0000 (16:47 -0700)]
Merge "Decrease length after reading from array in process_service_attr_req" into oc-dev
am:
ea5db7d0dd
Change-Id: Ib0106a936f256923819aa1acdefcad06e035b1c8
Hansong Zhang [Thu, 31 May 2018 22:41:29 +0000 (15:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc-dev am:
68e7c87d93 am:
872abf0d70
am:
45249aaaca -s ours
Change-Id: I851839e32c1edfbaf58af84fc7f9f8ab35e7eeb4
Hansong Zhang [Thu, 31 May 2018 22:35:47 +0000 (15:35 -0700)]
Merge changes from topic "am-
5821813f-624a-468d-ae05-
8b2918b15c74-nyc-dev" into oc-dev am:
e0863fe41e am:
5d0975d788
am:
7c0d1d7016
Change-Id: Ic9d853103c9f892c6b15c291e2bf373d7c8a811a
Hansong Zhang [Thu, 31 May 2018 22:28:26 +0000 (15:28 -0700)]
[automerger skipped] [automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
cf33d63af8 am:
9b0d9ee8fc am:
3df5904c55 skipped:
d61c73ca13 am:
81e4d7ca45 am:
e2efdf5c7c am:
6e62529383 am:
bfb627e982 skipped:
573c0521e8 am:
5767c158dc am:
b77d2d0e6f
am:
6a5fe4c62a -s ours
Change-Id: Icffaf12576f38fc7adacec0f4960079dcec44db0
Atanas Kirilov [Thu, 31 May 2018 22:04:41 +0000 (22:04 +0000)]
Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into oc-dev
Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]
Merge changes from topic "am-
94f6d099-67a7-4fc1-95d1-
65272646c688" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880 am:
1550baf2c5 am:
2d0acadd8c skipped:
addb4045bc
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880 am:
1550baf2c5 am:
2d0acadd8c
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880 am:
1550baf2c5
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784 am:
11efe10880
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
4375ef1784
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]
Merge changes from topic "am-
0ee00745-3175-4746-9daa-
2f8a6e252eaa" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec am:
3a501fb77b am:
fa56bb0ab9 skipped:
d8198b806f
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec am:
3a501fb77b am:
fa56bb0ab9
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec am:
3a501fb77b
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c am:
37372aa4ec
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a am:
bcf040b00c
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7 skipped:
64cd03aa4a
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e am:
c8367854c7
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd am:
222339b17e
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am:
6cf3df79fd
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
TreeHugger Robot [Thu, 31 May 2018 21:19:33 +0000 (21:19 +0000)]
Merge "SDP: Recalculate param_len after max_list_len" into pi-dev
TreeHugger Robot [Thu, 31 May 2018 21:18:21 +0000 (21:18 +0000)]
Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into oc-dev
TreeHugger Robot [Thu, 31 May 2018 21:18:04 +0000 (21:18 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8 am:
005feb04aa skipped:
8126caa355
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8 am:
005feb04aa
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]
Merge changes from topic "am-
f4bfe0c3-4263-420c-abf9-
a0e5b20986ff" into oc-dev
* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf am:
3357f0c98e am:
55ccee577b skipped:
2b41c41ccc
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf am:
3357f0c98e am:
55ccee577b
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf am:
3357f0c98e
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
Jakub Pawlowski [Thu, 31 May 2018 20:47:21 +0000 (20:47 +0000)]
Merge "Decrease length after reading from array in process_service_attr_req" into oc-dev
Hansong Zhang [Wed, 30 May 2018 21:16:23 +0000 (14:16 -0700)]
AVRCP: Reject invalid PlayItem and SetAddressedPlayer command
* Use CType REJECT to reject invalid PlayItem command
* Reject SetAddressPlayer command as it is not implemented
Bug:
80481276
Bug:
80483247
Test: PTS AVRCP/TG/MCN/NP/BI-01-C
Change-Id: I837f6d2661e94e09afaa72a9c0c77d5c1ffe9e98
(cherry picked from commit
fe5d973670cc6f95d7431f5a0699a326032e8b06)
Andre Eisenbach [Thu, 31 May 2018 20:41:00 +0000 (20:41 +0000)]
Merge "AVRCP: Reject invalid PlayItem and SetAddressedPlayer command" into pi-dev
Myles Watson [Tue, 29 May 2018 23:55:58 +0000 (16:55 -0700)]
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: I71392cf1a70567fec957feb36768069ac5258aa1
Hansong Zhang [Thu, 31 May 2018 19:59:07 +0000 (12:59 -0700)]
Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc-dev am:
68e7c87d93
am:
872abf0d70
Change-Id: Iab4c923a555c653154921c4fbb3f3cc33a5b4794
Hansong Zhang [Thu, 31 May 2018 19:58:37 +0000 (12:58 -0700)]
Merge changes from topic "am-
5821813f-624a-468d-ae05-
8b2918b15c74-nyc-dev" into oc-dev am:
e0863fe41e
am:
5d0975d788
Change-Id: Ib2079fce403f0d425cfee926dbc63dfff37c7be5
Hansong Zhang [Thu, 31 May 2018 19:58:05 +0000 (12:58 -0700)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
cf33d63af8 am:
9b0d9ee8fc am:
3df5904c55 skipped:
d61c73ca13 am:
81e4d7ca45 am:
e2efdf5c7c am:
6e62529383 am:
bfb627e982 skipped:
573c0521e8 am:
5767c158dc
am:
b77d2d0e6f
Change-Id: Ie603ca5fe96af4bae01a5e3d581b1c7ed0b3112b
Hansong Zhang [Thu, 31 May 2018 18:46:51 +0000 (11:46 -0700)]
Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc-dev
am:
68e7c87d93
Change-Id: I738a2678612fdd48af1c669736c04bb4875d9da5
Hansong Zhang [Thu, 31 May 2018 18:46:20 +0000 (11:46 -0700)]
Merge changes from topic "am-
5821813f-624a-468d-ae05-
8b2918b15c74-nyc-dev" into oc-dev
am:
e0863fe41e
Change-Id: Ic32b25694f9683b391af088914aa0e1f9a39798a
Hansong Zhang [Thu, 31 May 2018 18:45:39 +0000 (11:45 -0700)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
cf33d63af8 am:
9b0d9ee8fc am:
3df5904c55 skipped:
d61c73ca13 am:
81e4d7ca45 am:
e2efdf5c7c am:
6e62529383 am:
bfb627e982 skipped:
573c0521e8
am:
5767c158dc
Change-Id: I72b6f54d9ca8abcf72fa969f65f3ab7eb0889468
Hansong Zhang [Wed, 30 May 2018 21:16:23 +0000 (14:16 -0700)]
AVRCP: Reject invalid PlayItem and SetAddressedPlayer command
* Use CType REJECT to reject invalid PlayItem command
* Reject SetAddressPlayer command as it is not implemented
Bug:
80481276
Bug:
80483247
Test: PTS AVRCP/TG/MCN/NP/BI-01-C
Change-Id: I837f6d2661e94e09afaa72a9c0c77d5c1ffe9e98
TreeHugger Robot [Thu, 31 May 2018 17:42:18 +0000 (17:42 +0000)]
Merge "SMP: Check p_cb->role in smp_br_state_machine_event" into pi-dev
TreeHugger Robot [Thu, 31 May 2018 17:41:58 +0000 (17:41 +0000)]
Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into oc-dev
TreeHugger Robot [Thu, 31 May 2018 17:41:46 +0000 (17:41 +0000)]
Merge changes from topic "am-
5821813f-624a-468d-ae05-
8b2918b15c74-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d am:
f66eddbcb4 skipped:
266edcd1c9
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d am:
f66eddbcb4
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807
DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event
Android Build Merger (Role) [Wed, 30 May 2018 17:54:37 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf am:
3357f0c98e am:
55ccee577b skipped:
2b41c41ccc
Change-Id: Ie1708e0cf745d1fdf523e02fd434550ce697b2ec
Android Build Merger (Role) [Wed, 30 May 2018 17:54:36 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf am:
3357f0c98e am:
55ccee577b
Change-Id: I54d99dd008563a002eefa6bc39a9bc7df91ce4c8
Android Build Merger (Role) [Wed, 30 May 2018 17:54:34 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf am:
3357f0c98e
Change-Id: Ic873aa80e92bd02488b0abc3d56bedb6c221c880
Android Build Merger (Role) [Wed, 30 May 2018 17:54:33 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f am:
09bedb85bf
Change-Id: I45681640618b7dd21055547b1a21864f716c339d
Android Build Merger (Role) [Wed, 30 May 2018 17:54:31 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111 am:
a42a5d379f
Change-Id: I26448362b705378e5393f8a621a39db54c656580
Android Build Merger (Role) [Wed, 30 May 2018 17:54:30 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975 skipped:
4051c98111
Change-Id: Icd6b0ce2d5992e0ddc60146639c69cb092dc6bdf
Android Build Merger (Role) [Wed, 30 May 2018 17:54:27 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f am:
f078bbf975
Change-Id: I930a5cfd8ddecf3782b878d307aa576e47f49164
Android Build Merger (Role) [Wed, 30 May 2018 17:54:26 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938 am:
1ded57e67f
Change-Id: I7c1149eb4ace84dd30921e2d77b0e413540c1e98
Android Build Merger (Role) [Wed, 30 May 2018 17:54:24 +0000 (17:54 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
89f6f14938
Change-Id: I3fc3934d98a3d29f14f13246241ae2eff030972d
Android Build Merger (Role) [Wed, 30 May 2018 17:27:04 +0000 (17:27 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8 am:
005feb04aa skipped:
8126caa355
Change-Id: I1df83c5c1423385ed03447cca4392ebf13cea992
Android Build Merger (Role) [Wed, 30 May 2018 17:27:02 +0000 (17:27 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8 am:
005feb04aa
Change-Id: I4be51ae13aa73a4b474289dd21bcaeb82c575a30
Android Build Merger (Role) [Wed, 30 May 2018 17:27:01 +0000 (17:27 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865 am:
4077b530c8
Change-Id: I14bf21befe4489e808aba6c0f59fb92f58ee68fa
Android Build Merger (Role) [Wed, 30 May 2018 17:26:59 +0000 (17:26 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76 am:
873d339865
Change-Id: I70aa4efe7c58fddcca97197e73a1a6b439b7e94e
Android Build Merger (Role) [Wed, 30 May 2018 17:26:58 +0000 (17:26 +0000)]
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am:
ca8a83ba76
Change-Id: Ic3210b72e65bdd3cd26fe3c08f317e6f26254f06
Myles Watson [Tue, 29 May 2018 23:55:58 +0000 (16:55 -0700)]
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: I71392cf1a70567fec957feb36768069ac5258aa1
(cherry picked from commit
ef7dddabbd70222fa0fafc97e8562d977f550d26)
Myles Watson [Tue, 29 May 2018 23:55:58 +0000 (16:55 -0700)]
DO NOT MERGE: SDP: Recalculate param_len after max_list_len
Bug:
78136869
Test: manual connection to an A2DP device
Change-Id: I71392cf1a70567fec957feb36768069ac5258aa1
(cherry picked from commit
ef7dddabbd70222fa0fafc97e8562d977f550d26)
tedwang [Wed, 30 May 2018 17:01:54 +0000 (10:01 -0700)]
[automerger skipped] Merge changes from topic "avrcp-addressed-player-changed" am:
0b569b1d82
am:
0749d6d96d -s ours
Change-Id: Ib946ed13bdd8bb5e141f63a9d3e80ce410799ae4
tedwang [Wed, 30 May 2018 17:01:38 +0000 (10:01 -0700)]
[automerger skipped] Add respond track not selected interim when register notification am:
494dcc55ea
am:
43eb98fc32 -s ours
Change-Id: I1b82bf151c5b7989e42cd8364474a4858395c50a
Ajay Panicker [Wed, 30 May 2018 17:01:26 +0000 (10:01 -0700)]
[automerger skipped] Send UID 0 for track changed if there is no media ID am:
8b7b73764a
am:
69fa501461 -s ours
Change-Id: I41d1abd8d1ac07b32512484e48d4a94d6a5eea85
tedwang [Wed, 30 May 2018 16:56:23 +0000 (09:56 -0700)]
Merge changes from topic "avrcp-addressed-player-changed"
am:
0b569b1d82
Change-Id: I0a1fe4ac30fe95b6d86ebaac1cc8456e9b721c2c
tedwang [Wed, 30 May 2018 16:56:02 +0000 (09:56 -0700)]
Add respond track not selected interim when register notification
am:
494dcc55ea
Change-Id: I7dd35d6b985ee173f0bf6412a4f82bd69ab289ee
Ajay Panicker [Wed, 30 May 2018 16:55:38 +0000 (09:55 -0700)]
Send UID 0 for track changed if there is no media ID
am:
8b7b73764a
Change-Id: I1a980b9bc2937fe71cff0ef7c5ccdda5566393f5
Treehugger Robot [Wed, 30 May 2018 16:42:33 +0000 (16:42 +0000)]
Merge changes from topic "avrcp-addressed-player-changed"
* changes:
Send addressed and available player change for PTS test
Add respond track not selected interim when register notification
Send UID 0 for track changed if there is no media ID
Jakub Pawlowski [Wed, 30 May 2018 15:59:11 +0000 (08:59 -0700)]
LE Create Connection Complete - crash on Command Disallowed am:
f8e8c59bcb
am:
c71de3e48c
Change-Id: I4ec3d3068872dc317e16ec8a9ba5e7ae31a724e2
Jakub Pawlowski [Wed, 30 May 2018 15:53:07 +0000 (08:53 -0700)]
LE Create Connection Complete - crash on Command Disallowed
am:
f8e8c59bcb
Change-Id: Ia6f2a7958eb9df8b5d87f9d0daa5508aa2009c61
Jakub Pawlowski [Wed, 30 May 2018 05:32:08 +0000 (22:32 -0700)]
Merge "Fix race condition in LE Create Connection Cancel handling" am:
bba6b8a3da
am:
1244cf9130
Change-Id: Ib135d2197089e398948db18ef192456981e3d8a7
tedwang [Wed, 30 May 2018 04:26:23 +0000 (21:26 -0700)]
Merge "Send addressed and available player change for PTS test" into pi-dev
am:
7c27137325
Change-Id: Ife0ce17268dddcc4e931720cec4d6ea48933ac3c
Jakub Pawlowski [Wed, 30 May 2018 04:19:12 +0000 (21:19 -0700)]
Merge "Fix race condition in LE Create Connection Cancel handling"
am:
bba6b8a3da
Change-Id: I86ad4d40935d3fbf5f86234f51fe6854763adf94
tedwang [Fri, 18 May 2018 10:16:40 +0000 (18:16 +0800)]
Send addressed and available player change for PTS test
Implement HandleAddressPlayerUpdate() and HandAvailablePlayerUpdate()
for PTS test.
Bug:
79375787 79376305
Test: PTS Test AVRCPTG/MPS/BV-05-C AVRCP/TG/MPS/BV-07-C
Change-Id: I6b976af8bdd1afcc9799c50c8e558939cf7be187
Merged-In: I6b976af8bdd1afcc9799c50c8e558939cf7be187
(cherry picked from commit
7a3f78eaa6294d5079312dc9f0e5c7d5c6b5e059)
tedwang [Wed, 16 May 2018 11:51:26 +0000 (19:51 +0800)]
Add respond track not selected interim when register notification
Respond interim with Identifier 0xFFFFFFFFFFFFFFFF register
notification for EVENT_TRACK_CHANGE for pts test
Bug:
79378129
Test: PTS AVRCP/TG/NFY/BV-04-C
Change-Id: Ia861bf4682e9daf9c7c3842df9f95381171da574
Merged-In: Ia861bf4682e9daf9c7c3842df9f95381171da574
(cherry picked from commit
a25fca2acb30aafab9cedc521888b794b703eff3)
Ajay Panicker [Tue, 8 May 2018 23:34:04 +0000 (16:34 -0700)]
Send UID 0 for track changed if there is no media ID
Some carkits need the track changed UID to change even though we
explicitly report that UID's are refreshed on any now playing list
change. UID 0 is special since it represents that the song has changed
and forces an update.
Bug:
72824896
Test: Tested with Audi carkit where Spotify wasn't updating past the
first song previously.
Change-Id: I033f9a2f96acfde25922d6912a4927b95fb89596
Merged-In: I033f9a2f96acfde25922d6912a4927b95fb89596
(cherry picked from commit
2789ae2b57085aad446d7e062f66f5d83cf26e0b)
TreeHugger Robot [Wed, 30 May 2018 03:27:24 +0000 (03:27 +0000)]
Merge "Send addressed and available player change for PTS test" into pi-dev
Jakub Pawlowski [Wed, 30 May 2018 02:56:01 +0000 (19:56 -0700)]
Merge changes I88886146,I1c076c7f into pi-dev
am:
02fa06d70d
Change-Id: I75cfe44bf91f17c478332d5c5c6dbaa25210d8d4
TreeHugger Robot [Wed, 30 May 2018 02:47:14 +0000 (02:47 +0000)]
Merge changes I88886146,I1c076c7f into pi-dev
* changes:
LE Create Connection Complete - crash on Command Disallowed
Fix race condition in LE Create Connection Cancel handling
Jakub Pawlowski [Tue, 29 May 2018 22:28:15 +0000 (15:28 -0700)]
LE Create Connection Complete - crash on Command Disallowed
When LE Create Connection Complete is received with status "Command
Disallowed", we can't tell which state we should transition to. This
can be triggered only in case of rare race condition. Crash to recover.
This was introduced in
24adb37e4106bf8544c7729d34451fdf2777c4dc, when
generic handling of all errors to this event was added.
Bug:
77429706
Test: sl4a GattConnectTest
Change-Id: I888861461da296876d97e8784a3dc7c53130fb51
Jakub Pawlowski [Wed, 30 May 2018 02:43:52 +0000 (02:43 +0000)]
Merge "Fix race condition in LE Create Connection Cancel handling"
Hansong Zhang [Wed, 30 May 2018 02:26:53 +0000 (19:26 -0700)]
Bluetooth HFP: Use WBS by default (1/5) am:
6146eb0104
am:
e19b8d25be
Change-Id: Iba92d9ea6915218f6a9664df6737338992af88ac
tedwang [Wed, 30 May 2018 02:23:28 +0000 (19:23 -0700)]
Add respond track not selected interim when register notification
am:
a25fca2acb
Change-Id: I22e8c9b0e71c642beb5e8e951dfcf224f9c47f05
Hansong Zhang [Wed, 30 May 2018 01:16:04 +0000 (18:16 -0700)]
Bluetooth HFP: Use WBS by default (1/5)
am:
6146eb0104
Change-Id: I9bd2099abb40d9c3f07c5af0a8245c0ee42eb42f
Hansong Zhang [Wed, 30 May 2018 00:38:39 +0000 (17:38 -0700)]
SMP: Check p_cb->role in smp_br_state_machine_event
Bug:
80145946
Test: manual
Change-Id: Ic83eaa4be868d5a345d80cd50a6915c0af719a53
OSDN Git Service
