OSDN Git Service
Atanas Kirilov [Fri, 1 Jun 2018 00:02:27 +0000 (17:02 -0700)]
Merge changes from topic "am-
ba736da7-b534-414b-a405-
b0397951e24d" into oc-dev
am:
c691f7a61d
Change-Id: I49cc66fae3e6bbd7de8589ad6de17d6a5a3e5399
Atanas Kirilov [Fri, 1 Jun 2018 00:02:03 +0000 (17:02 -0700)]
Merge "RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)" into oc-dev
am:
4ac23a31e2
Change-Id: I7c0c0f1b6d8efae4f263d20f97041b2acffa78f6
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
Atanas Kirilov [Thu, 31 May 2018 22:05:07 +0000 (22:05 +0000)]
Merge changes from topic "am-
ba736da7-b534-414b-a405-
b0397951e24d" into oc-dev
* changes:
[automerger skipped] RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2) skipped:
23918433c1
RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)
Atanas Kirilov [Thu, 31 May 2018 22:05:01 +0000 (22:05 +0000)]
Merge "RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)" into oc-dev
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: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
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 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
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)
Hansong Zhang [Wed, 30 May 2018 00:38:39 +0000 (17:38 -0700)]
DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event
Bug:
80145946
Test: manual
Change-Id: Ic83eaa4be868d5a345d80cd50a6915c0af719a53
Android Build Merger (Role) [Wed, 30 May 2018 00:36:52 +0000 (00:36 +0000)]
[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
Change-Id: I2064e1a0cc043b6a33b6d67e1f68208dd8af5552
Android Build Merger (Role) [Wed, 30 May 2018 00:36:51 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d am:
f66eddbcb4
Change-Id: I39593f01bf46b3cf9d6c39242403beb07370032b
Android Build Merger (Role) [Wed, 30 May 2018 00:36:49 +0000 (00:36 +0000)]
[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
Change-Id: I51341260985e3fc9032102925c440b76b5e0def6
Android Build Merger (Role) [Wed, 30 May 2018 00:36:49 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467 am:
e8db90132d
Change-Id: Idd75518613dd8123342229f9d31a5ad6d9321e17
Android Build Merger (Role) [Wed, 30 May 2018 00:36:48 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807 am:
9e5fea5467
Change-Id: I17fb1bc9fc1ee83746b0e4968e4656ba58c3c113
Android Build Merger (Role) [Wed, 30 May 2018 00:36:47 +0000 (00:36 +0000)]
[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
Change-Id: If8370e6d5e5840c44d91d4d7b2fcd65687a78526
Android Build Merger (Role) [Wed, 30 May 2018 00:36:46 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
078756d807
Change-Id: Iacc5a09fa8f94ac3f8343b2ab7ff47a2c2e4f250
Android Build Merger (Role) [Wed, 30 May 2018 00:36:45 +0000 (00:36 +0000)]
[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
Change-Id: Ie603088c14d795c4e39eeda46b38a6612844ef87
Hansong Zhang [Wed, 30 May 2018 00:35:01 +0000 (17:35 -0700)]
DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event
Bug:
80145946
Test: manual
Change-Id: Ic83eaa4be868d5a345d80cd50a6915c0af719a53
Android Build Merger (Role) [Wed, 30 May 2018 00:36:42 +0000 (00:36 +0000)]
[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
Change-Id: I8b19e5732084a8861c6d42c7f374624c69acaf12
Android Build Merger (Role) [Wed, 30 May 2018 00:36:40 +0000 (00:36 +0000)]
[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
Change-Id: Iaab5f9d0d80d3dc784fc93eb5ae6e3b97a6c1246
Android Build Merger (Role) [Wed, 30 May 2018 00:36:38 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
cf33d63af8 am:
9b0d9ee8fc am:
3df5904c55 skipped:
d61c73ca13
Change-Id: I910d07217dfc15485d8a684d4cd9b6d95476c3bc
Android Build Merger (Role) [Wed, 30 May 2018 00:36:36 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
cf33d63af8 am:
9b0d9ee8fc am:
3df5904c55
Change-Id: I527c4a73512f47727d75144c904e2baffa409974
Android Build Merger (Role) [Wed, 30 May 2018 00:36:34 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
cf33d63af8 am:
9b0d9ee8fc
Change-Id: I9997b7d81fbaaf71cc2c79b0f6d1e81981e56daa
Android Build Merger (Role) [Wed, 30 May 2018 00:36:32 +0000 (00:36 +0000)]
[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am:
cf33d63af8
Change-Id: Ief4df7632af850dd7a2caa80046855644aa2df6d
Hansong Zhang [Wed, 30 May 2018 00:35:01 +0000 (17:35 -0700)]
DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event
Bug:
80145946
Test: manual
Change-Id: Ic83eaa4be868d5a345d80cd50a6915c0af719a53
Jakub Pawlowski [Tue, 29 May 2018 23:17:32 +0000 (16:17 -0700)]
Decrease length after reading from array in process_service_attr_req
Test: compilation
Bug:
78136677
Change-Id: I4807a350e2b4764a93f104ce88f23a957a7e85c0
Jakub Pawlowski [Sat, 26 May 2018 15:01:13 +0000 (08:01 -0700)]
[automerger skipped] [automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64 skipped:
89580929ab
am:
532c9426ec -s ours
Change-Id: Iba3ee8429d5f63384d2f617913a326428ca48fde
Jakub Pawlowski [Sat, 26 May 2018 07:36:48 +0000 (00:36 -0700)]
GATT: Handle too short Error Response PDU
am:
5fd33061c4
Change-Id: Idb329c5956132c13de53fd34cdbe0dc89efc1aa1
Android Build Merger (Role) [Sat, 26 May 2018 07:30:26 +0000 (07:30 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64 skipped:
89580929ab
Change-Id: Ic8f13917ab7a7682aa352076d12f09ec575170ea
Android Build Merger (Role) [Sat, 26 May 2018 07:29:23 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4 am:
ce3eb99f64
Change-Id: I94a5085e6d4a16759253179d34194ad17885aabb
Android Build Merger (Role) [Sat, 26 May 2018 07:29:21 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523 am:
98b95ec8b4
Change-Id: I9dc6a8173995d2337c9e59ae6dbfc201143245e9
Android Build Merger (Role) [Sat, 26 May 2018 07:29:20 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed am:
aebdc76523
Change-Id: Ie2a4ba49599805c63b4d3ad81d2b6b50e53c385f
Android Build Merger (Role) [Sat, 26 May 2018 07:29:18 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3 am:
272ded19ed
Change-Id: If0a5e66c97c1acb07555cd20c0a4bbed62e40a9a
Android Build Merger (Role) [Sat, 26 May 2018 07:29:16 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11 am:
ed1ba213f3
Change-Id: I5a24b2d428c69771380e3d6484f9770a3c8cf33e
Android Build Merger (Role) [Sat, 26 May 2018 07:29:15 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2 am:
bdcc61da11
Change-Id: I43e8c151fffa381413347fa2429b4a996f432199
Android Build Merger (Role) [Sat, 26 May 2018 07:29:14 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055 am:
1e8cabdae2
Change-Id: I3edb3cd03b07aa7dba92f6d90026dd1c1e8d3b6b
Android Build Merger (Role) [Sat, 26 May 2018 07:29:12 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am:
03881d1055
Change-Id: I1d7cb68481b798a0f59b8b8bdf6639f5fb1c5fea
Jakub Pawlowski [Wed, 23 May 2018 17:30:19 +0000 (10:30 -0700)]
GATT: Handle too short Error Response PDU
Since the spec is not clear what to do in this case, use one of
reserved error codes as a failure reason, and pass it to upper layers.
Bug:
79591688
Change-Id: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Merged-In: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Jakub Pawlowski [Wed, 23 May 2018 17:19:53 +0000 (10:19 -0700)]
GATT: Handle too short Error Response PDU
Since the spec is not clear what to do in this case, use one of
reserved error codes as a failure reason, and pass it to upper layers.
Bug:
79591688
Change-Id: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Merged-In: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Jakub Pawlowski [Sat, 26 May 2018 03:51:41 +0000 (20:51 -0700)]
[automerger skipped] [automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0 skipped:
0488ddb980
am:
147da61cb8 -s ours
Change-Id: Ie6defc0efc49dc58d3e2f7d262f2277a617d77c3
Android Build Merger (Role) [Sat, 26 May 2018 02:56:23 +0000 (02:56 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0 skipped:
0488ddb980
Change-Id: Id6fbc4d73a7b922ff9224850000a4a1f10b81050
Android Build Merger (Role) [Sat, 26 May 2018 02:50:31 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71 am:
2f5acf66b0
Change-Id: I55b0755496a55a6f1c5a84227104f6478f05d0b4
Android Build Merger (Role) [Sat, 26 May 2018 02:50:30 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9 am:
42d53a8c71
Change-Id: I5516d1c6ec683898b459bf9ba9c57299404aa42f
Android Build Merger (Role) [Sat, 26 May 2018 02:50:28 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed am:
13a24d8cc9
Change-Id: Id9651d76b8cd1ab201f5f3024ea8f7b2d57de521
Android Build Merger (Role) [Sat, 26 May 2018 02:50:26 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742 am:
1e0d3bafed
Change-Id: If52d04ab58a88e517a559d11d4f876a2ba56d70f
Android Build Merger (Role) [Sat, 26 May 2018 02:50:25 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8 am:
0f69ef1742
Change-Id: I274a46dd9edf3810f47daf791e1dc69c6ba0504b
Android Build Merger (Role) [Sat, 26 May 2018 02:50:23 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d am:
c8a02c4bd8
Change-Id: Ib296956f3e5ff59ed7f02d61dcc6bf93e572c58f
Android Build Merger (Role) [Sat, 26 May 2018 02:50:21 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d am:
ab7f755c9d
Change-Id: Ib45cb979df156f9871bbe845dcd12d291681035e
Android Build Merger (Role) [Sat, 26 May 2018 02:50:19 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am:
3181bdee7d
Change-Id: Ib457d90751151790f92abe23b38596c02f0a69af
Jakub Pawlowski [Fri, 25 May 2018 22:21:11 +0000 (15:21 -0700)]
Add PDU size checks in process_service_search_attr_rsp
am:
980f6427b1
Change-Id: I08d0a722f3421a59ed81c1324062d35ebe5057bd
Jakub Pawlowski [Thu, 24 May 2018 15:59:34 +0000 (08:59 -0700)]
Add PDU size checks in process_service_search_attr_rsp
Bug:
79884292
Change-Id: Icc02a6188f806f766aa8676804d74995afa08d25
Merged-In: Icc02a6188f806f766aa8676804d74995afa08d25
Jakub Pawlowski [Thu, 24 May 2018 15:59:34 +0000 (08:59 -0700)]
Add PDU size checks in process_service_search_attr_rsp
Bug:
79884292
Change-Id: Icc02a6188f806f766aa8676804d74995afa08d25
Merged-In: Icc02a6188f806f766aa8676804d74995afa08d25
akirilov [Mon, 21 May 2018 19:56:17 +0000 (12:56 -0700)]
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
Bug:
74075873
Test: manual test (poc in bug)
Change-Id: I56e87cfdf8731acca00cefac98abb2ba06f6e7ed
akirilov [Mon, 21 May 2018 18:45:55 +0000 (11:45 -0700)]
RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)
Bug:
74075873
Test: manual
Change-Id: I9a7035a74aca3256c5712ea67a7435627b139c37
Android Build Merger (Role) [Mon, 21 May 2018 18:43:37 +0000 (18:43 +0000)]
[automerger skipped] RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2) skipped:
23918433c1
Change-Id: Ie92acb6453b3d0ab0728c5e34ffb667971d07eb2
akirilov [Fri, 27 Apr 2018 22:12:59 +0000 (15:12 -0700)]
RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)
Bug:
74075873
Test: manual
Change-Id: I76058b11c90dc40b78f26fb64b74d609f3473f5d
Ajay Panicker [Mon, 14 May 2018 18:37:26 +0000 (11:37 -0700)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev
am:
28af3285c7
Change-Id: I9bb0aa68376166994103a659d181e3f7f071c3b5
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into oc-dev
* changes:
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb am:
58304c3cf3 skipped:
ec6632f93a
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb am:
58304c3cf3
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
DO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb am:
58304c3cf3
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
DO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b am:
703cd5a1eb
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
DO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241 am:
e24f24f31b
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
DO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-
deb20f2a-d7e9-4660-922e-
16ad46b80c7a" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am:
d28e985241
DO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into nyc-dev
Ajay Panicker [Mon, 14 May 2018 18:11:06 +0000 (11:11 -0700)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev
am:
89c77dff32
Change-Id: I50263727a1020e77133f92938f6ecf0770eef14f
Ajay Panicker [Mon, 14 May 2018 18:01:38 +0000 (18:01 +0000)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev
Ajay Panicker [Fri, 11 May 2018 22:37:23 +0000 (15:37 -0700)]
Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev
am:
2f9f6adfed
Change-Id: Ic6cfdf0368ff5b55a0cc0a4a41b006947d520cd4
Hansong Zhang [Fri, 11 May 2018 22:37:00 +0000 (15:37 -0700)]
Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev
am:
cf48e73715
Change-Id: Ie3b83f993975a6ac532072c774a3ca6c0d0b5272
Hansong Zhang [Fri, 11 May 2018 22:36:38 +0000 (15:36 -0700)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am:
9ca8320100 am:
e621790539 am:
26881fbd81 am:
90f604c087 skipped:
5ab83c7a00
am:
e719eb2c4f
Change-Id: I4626e6077542b983e7b6c8ba40d58f462fc215bb
OSDN Git Service
