OSDN Git Service
Benson Li [Wed, 18 Jul 2018 19:07:18 +0000 (12:07 -0700)]
[automerger skipped] Merge "AVRCP: Reject SetAddressedPlayer command only if remote set invalid player ID" into pi-dev
am:
3ff7033b27 -s ours
Change-Id: I5303a47ddb949dd84d9f6b19d89e924401f3f063
TreeHugger Robot [Wed, 18 Jul 2018 18:58:15 +0000 (18:58 +0000)]
Merge "AVRCP: Reject SetAddressedPlayer command only if remote set invalid player ID" into pi-dev
Jack He [Wed, 18 Jul 2018 00:05:21 +0000 (17:05 -0700)]
Merge "Metrics: Add python script to dump metrics into ASCII format" am:
85cce9b01f
am:
ca55025537
Change-Id: I025ffdc3ea9e6ffd2d2f3b110f87fe3291dda036
Jack He [Tue, 17 Jul 2018 23:59:50 +0000 (16:59 -0700)]
Merge "Metrics: Add python script to dump metrics into ASCII format"
am:
85cce9b01f
Change-Id: Ib882d2a6fc9d430cb7d0bf55e0e7c551b7b2d05a
Treehugger Robot [Tue, 17 Jul 2018 23:50:34 +0000 (23:50 +0000)]
Merge "Metrics: Add python script to dump metrics into ASCII format"
Jack He [Fri, 13 Jul 2018 21:54:38 +0000 (14:54 -0700)]
Metrics: Add python script to dump metrics into ASCII format
Test: make,
./dump_metrics_ascii.py proto/bluetooth/metrics/bluetooth.proto
Change-Id: Ie671fa2c2ceb9f93ed62495b592a2cf9d69ff41b
Ben YoungTae Kim [Tue, 17 Jul 2018 03:52:12 +0000 (20:52 -0700)]
Increase DM connection size for multiple links am:
d12993c4f6
am:
a6790ee15f
Change-Id: I0638becb9228a0e4ffffbcc3a411253edf13a521
Ben YoungTae Kim [Tue, 17 Jul 2018 03:49:06 +0000 (20:49 -0700)]
Increase DM connection size for multiple links
am:
d12993c4f6
Change-Id: I0a0d4cc4a0e8f32d3b3407c370389260f864a3e7
Ben YoungTae Kim [Tue, 10 Jul 2018 00:58:12 +0000 (17:58 -0700)]
Increase DM connection size for multiple links
For multiple headset connections, it will be increased to support
multiple services(HFP/AV/CT) for each links.
Test: Connect to 4 or more headsets and play music
Bug:
110972513
Change-Id: I56f69e12fb1a4a614c69fa383e9c53675a189fc9
Hansong Zhang [Sat, 14 Jul 2018 00:36:54 +0000 (17:36 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev am:
e6d78b9c37 am:
a7992011a4 am:
4a8e14e16b
am:
e84112ce6a
Change-Id: I79f1180ef4b7a4751d74f2cbb3573e540cdd134b
Hansong Zhang [Sat, 14 Jul 2018 00:36:24 +0000 (17:36 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14 am:
93110a553e am:
aa7175ae97 am:
05211b1947 -s ours
am:
3bd185c062
Change-Id: I33237b85346d7f18586959942a22a01fc534830c
Hansong Zhang [Sat, 14 Jul 2018 00:35:47 +0000 (17:35 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa am:
d88cfe6530 -s ours am:
85a799bff2 -s ours am:
af35291d41 -s ours
am:
3d564ba040 -s ours
Change-Id: I8382303d87f22a3a3c6d567e8e849e6e31818761
Hansong Zhang [Sat, 14 Jul 2018 00:20:24 +0000 (17:20 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev am:
e6d78b9c37 am:
a7992011a4
am:
4a8e14e16b
Change-Id: Iab5a146f0f22780a38192c1e5294350738daf0a7
Hansong Zhang [Sat, 14 Jul 2018 00:19:59 +0000 (17:19 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14 am:
93110a553e am:
aa7175ae97
am:
05211b1947 -s ours
Change-Id: If80c66ab182419dbe22d455dd332ec20c3670da9
Hansong Zhang [Sat, 14 Jul 2018 00:19:47 +0000 (17:19 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa am:
d88cfe6530 -s ours am:
85a799bff2 -s ours
am:
af35291d41 -s ours
Change-Id: I01cde7e51e2ebf2482746aa19f23ba3d925923ef
Hansong Zhang [Sat, 14 Jul 2018 00:07:40 +0000 (17:07 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev am:
e6d78b9c37
am:
a7992011a4
Change-Id: I2dbe619f4db2afd28f1426265e2e43c5ede9efd3
Hansong Zhang [Sat, 14 Jul 2018 00:07:13 +0000 (17:07 -0700)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14 am:
93110a553e
am:
aa7175ae97
Change-Id: Ic9876c6ff2c1919976e2409970f02f61f4c4db20
Hansong Zhang [Sat, 14 Jul 2018 00:06:42 +0000 (17:06 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa am:
d88cfe6530 -s ours
am:
85a799bff2 -s ours
Change-Id: I5cf4f65085bc701e75af5556d0315e2923b8f1ea
Hansong Zhang [Fri, 13 Jul 2018 23:12:06 +0000 (16:12 -0700)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev
am:
e6d78b9c37
Change-Id: Id4bc567e478860b199e7cbea2c91fc163b0cc01f
TreeHugger Robot [Fri, 13 Jul 2018 23:00:24 +0000 (23:00 +0000)]
Merge "Fix a wrong check in rfc_parse_data" into oc-dev
Hansong Zhang [Fri, 13 Jul 2018 22:31:26 +0000 (15:31 -0700)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14
am:
93110a553e
Change-Id: I6e00c18146c048be020c8077b9b3ba7a8aabe2a0
Hansong Zhang [Fri, 13 Jul 2018 22:30:55 +0000 (15:30 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa
am:
d88cfe6530 -s ours
Change-Id: I2d99954f7ee5fd5f246eae2158a01fb4f4c679a6
Hansong Zhang [Fri, 13 Jul 2018 20:45:46 +0000 (13:45 -0700)]
Fix a wrong check in rfc_parse_data
Bug:
78288018
Bug:
111436796
Test: manual
Change-Id: I16e6026acbaac230fe1453bbac040d1b75bcea2a
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:17 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf skipped:
54cb89ba14
Change-Id: I26b9980c190e11ac0676e4ca3d24766614653d96
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:15 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9 am:
fd37563baf
Change-Id: I81864bd4e4a97b50a9e22ba426e336717463496f
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:13 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53 am:
78f26ef5c9
Change-Id: I7b018c136700d25e8a4905d0245d802979ea8c78
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:12 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942 am:
220ef97d53
Change-Id: I58c883eeac2c4a6db16ed70ba54cade1e548e549
Android Build Merger (Role) [Fri, 13 Jul 2018 20:44:10 +0000 (20:44 +0000)]
[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am:
4cea938942
Change-Id: Ic4a9218144a8c88e8bc84177d0f85c976fae1844
Hansong Zhang [Fri, 13 Jul 2018 20:43:27 +0000 (13:43 -0700)]
DO NOT MERGE Fix a wrong check in rfc_parse_data
Bug:
78288018
Bug:
111436796
Test: manual
Change-Id: I16e6026acbaac230fe1453bbac040d1b75bcea2a
Benson Li [Fri, 13 Jul 2018 20:19:34 +0000 (13:19 -0700)]
Merge "HFP: Reset BTA SCO control block when bta_ag_create_sco failed" am:
44e0158c80
am:
86ef9a9496
Change-Id: I1fb4fe0452d51b188ff8d8e68957de5905d6b88a
Jack He [Fri, 13 Jul 2018 20:18:27 +0000 (13:18 -0700)]
Merge "SCO: Allocate 6 BTM SCO control blocks for Multi-HFP support" am:
ef3927a23e
am:
995c00da80
Change-Id: I7d1e4be7c8c4b9bd401a73cfeaf587d2f4767651
Benson Li [Fri, 13 Jul 2018 20:10:16 +0000 (13:10 -0700)]
Merge "HFP: Reset BTA SCO control block when bta_ag_create_sco failed"
am:
44e0158c80
Change-Id: I9f87fd712572e9495b5bceac2f7b96985c963a58
Jack He [Fri, 13 Jul 2018 20:09:18 +0000 (13:09 -0700)]
Merge "SCO: Allocate 6 BTM SCO control blocks for Multi-HFP support"
am:
ef3927a23e
Change-Id: Ic87f2bca46c7f3313e7ec9c838ba49fbac0441e5
Treehugger Robot [Fri, 13 Jul 2018 19:59:10 +0000 (19:59 +0000)]
Merge "HFP: Reset BTA SCO control block when bta_ag_create_sco failed"
Treehugger Robot [Fri, 13 Jul 2018 19:58:46 +0000 (19:58 +0000)]
Merge "SCO: Allocate 6 BTM SCO control blocks for Multi-HFP support"
Hansong Zhang [Fri, 13 Jul 2018 17:50:22 +0000 (10:50 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67 am:
8e51fb603d -s ours am:
262a81d328 -s ours am:
8729bc8b2a -s ours
am:
b07d6f48b0 -s ours
Change-Id: I1c3e304f6df2004f2f9279a07ebe2c8c500f6e9e
Hansong Zhang [Fri, 13 Jul 2018 17:20:02 +0000 (10:20 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67 am:
8e51fb603d -s ours am:
262a81d328 -s ours
am:
8729bc8b2a -s ours
Change-Id: If2af5bbcbf0036810c76d2f5920742c8965c38fa
Hansong Zhang [Fri, 13 Jul 2018 16:51:51 +0000 (09:51 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67 am:
8e51fb603d -s ours
am:
262a81d328 -s ours
Change-Id: Ic909e32a9c23540ac149709e4686f9d705bae687
Hansong Zhang [Fri, 13 Jul 2018 16:32:45 +0000 (09:32 -0700)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67
am:
8e51fb603d -s ours
Change-Id: Ic2a62fcfb00d4a25a97c505e15926cc4bd806066
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:37 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c skipped:
cdcca17caa
Change-Id: Ifcbc63cb72a2cc8659792d9e1a02c8241d97b8b2
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:35 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc am:
c359938d3c
Change-Id: I103f98d8725fa7e12dad4a89a66e691e20cd4651
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:33 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c am:
fdb84d21dc
Change-Id: Ia0ef6e7edf06eee0e01e88451b9b4c162620e145
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:31 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4 am:
cbb88ee35c
Change-Id: I8a01f6d1b1a0555c98fa72d27c796cd5756eb1bf
Android Build Merger (Role) [Fri, 13 Jul 2018 16:18:30 +0000 (16:18 +0000)]
[automerger] DO NOT MERGE Add bound check for rfc_parse_data am:
ee82a400c4
Change-Id: I56a6a6281f816339d4028f84c1c720426863c21f
Hansong Zhang [Thu, 7 Jun 2018 23:11:27 +0000 (16:11 -0700)]
DO NOT MERGE Add bound check for rfc_parse_data
Bug:
78288018
Test: manual
Change-Id: I44349cd22c141483d01bce0f5a2131b727d0feb0
Merged-In: I44349cd22c141483d01bce0f5a2131b727d0feb0
(cherry picked from commit
1b9a465eea85e86984bb1e53be69880159e59c69)
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:25 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de skipped:
fff4962f67
Change-Id: Ia28843cf75c09affea13d302054e9b31943b4247
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:23 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714 skipped:
99381269de
Change-Id: Ib634ea6caddad254fa971dc5993fb66697855e05
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:20 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2 skipped:
226e8be714
Change-Id: I4a1b737c01d4a2a0aac153dfa857a4e91b8858b8
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:19 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c skipped:
14a18f65e2
Change-Id: I9529f804880eb014a2e40b71e19af49a369d0c40
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:17 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40 skipped:
7c03b49a3c
Change-Id: I93bd0e643f666e1f2c2af36fb56186e725ab6e03
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:15 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87 skipped:
b1f262ed40
Change-Id: I7b848bbdf257721c4f653daeb531ec2f6be4a6ad
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:13 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e skipped:
aa697e3f87
Change-Id: Ibc434fafa8043a4c9b42e26a80d893441a4cef27
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:11 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea skipped:
5741c6951e
Change-Id: I0e691f7030013c84b90a10e20e67274ac2408025
Android Build Merger (Role) [Fri, 13 Jul 2018 16:16:09 +0000 (16:16 +0000)]
[automerger skipped] Add bound check for rfc_parse_data skipped:
1b9a465eea
Change-Id: I4c80ed01bf081bfe6ab6d27fcbb5b685309fb2a2
Hansong Zhang [Thu, 7 Jun 2018 23:11:27 +0000 (16:11 -0700)]
Add bound check for rfc_parse_data
Bug:
78288018
Test: manual
Change-Id: I44349cd22c141483d01bce0f5a2131b727d0feb0
Merged-In: I44349cd22c141483d01bce0f5a2131b727d0feb0
Jakub Pawlowski [Fri, 13 Jul 2018 13:50:05 +0000 (06:50 -0700)]
[automerger skipped] [automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124 am:
dee921631a am:
ebee1a8658 am:
bde49a9c60 am:
e6e84901aa am:
15eee6efec -s ours am:
1e89f1d35c -s ours am:
007ae2dd82 -s ours
am:
5631a81bd2 -s ours
Change-Id: I0ffa751e6ba6d9b0e2b37dc429e5946c10a4af8d
Jakub Pawlowski [Fri, 13 Jul 2018 13:48:15 +0000 (06:48 -0700)]
[automerger skipped] [automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124 am:
dee921631a am:
ebee1a8658 am:
bde49a9c60 am:
e6e84901aa am:
15eee6efec -s ours am:
1e89f1d35c -s ours
am:
007ae2dd82 -s ours
Change-Id: I18f2b5ca397f3c1a4182e78416e85aa8d3712860
Jakub Pawlowski [Fri, 13 Jul 2018 13:43:08 +0000 (06:43 -0700)]
[automerger skipped] [automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124 am:
dee921631a am:
ebee1a8658 am:
bde49a9c60 am:
e6e84901aa am:
15eee6efec -s ours
am:
1e89f1d35c -s ours
Change-Id: I25c5dc87c61f64e82ed57a8df85d52fff2ceee29
Jakub Pawlowski [Fri, 13 Jul 2018 13:38:07 +0000 (06:38 -0700)]
[automerger skipped] [automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124 am:
dee921631a am:
ebee1a8658 am:
bde49a9c60 am:
e6e84901aa
am:
15eee6efec -s ours
Change-Id: I97207737c29cf988b2ae3c564a5deeb77ef136b5
Jakub Pawlowski [Fri, 13 Jul 2018 13:00:02 +0000 (06:00 -0700)]
[automerger skipped] Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into oc-dev am:
c61957fc79 -s ours am:
ebd4902d00 -s ours am:
5456b634ad -s ours
am:
2ee9b1867b -s ours
Change-Id: I6ae1ed45ee2b4836cde43e08928e9b85921d9e0f
Jakub Pawlowski [Fri, 13 Jul 2018 12:55:59 +0000 (05:55 -0700)]
[automerger skipped] Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into oc-dev am:
c61957fc79 -s ours am:
ebd4902d00 -s ours
am:
5456b634ad -s ours
Change-Id: I65ae561b74373966a705f2a4f4f5ac6ba0149104
Jakub Pawlowski [Fri, 13 Jul 2018 12:51:54 +0000 (05:51 -0700)]
[automerger skipped] Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into oc-dev am:
c61957fc79 -s ours
am:
ebd4902d00 -s ours
Change-Id: I653f9c6173defe2936d0529ee1aef350671ceec5
Nitin Shivpure [Fri, 13 Jul 2018 12:50:03 +0000 (05:50 -0700)]
[automerger skipped] [automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a am:
ebc968f44e skipped:
eac1fcbb72 am:
53f2d61220 -s ours am:
abceaf0fe7 -s ours am:
3476c0672b -s ours
am:
c4e0b1701a -s ours
Change-Id: Iff9fe8b088b8d75e31ab2eef3a6a98edd9d51ef8
Jakub Pawlowski [Fri, 13 Jul 2018 12:47:49 +0000 (05:47 -0700)]
[automerger skipped] Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into oc-dev
am:
c61957fc79 -s ours
Change-Id: I80698043abd89109bb84f53051e56f75066ae78c
Android Build Merger (Role) [Fri, 13 Jul 2018 12:47:22 +0000 (12:47 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124 am:
dee921631a am:
ebee1a8658 am:
bde49a9c60 am:
e6e84901aa
Change-Id: If9a5923dbf999be582acef19405470a76c97bce2
Android Build Merger (Role) [Fri, 13 Jul 2018 12:47:19 +0000 (12:47 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124 am:
dee921631a am:
ebee1a8658 am:
bde49a9c60
Change-Id: Ib1dc3304c1a85aa4161a4e4798ce6f992493f03f
Android Build Merger (Role) [Fri, 13 Jul 2018 12:47:16 +0000 (12:47 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124 am:
dee921631a am:
ebee1a8658
Change-Id: I965d8a637b3f56bc26d95f70afd2ab25750f1aa9
Android Build Merger (Role) [Fri, 13 Jul 2018 12:47:13 +0000 (12:47 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124 am:
dee921631a
Change-Id: I79eb82aa7df90484eae4167ea6524035b3fe07dc
Android Build Merger (Role) [Fri, 13 Jul 2018 12:47:10 +0000 (12:47 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d am:
c4a8457124
Change-Id: I85f2fa39093ea9b37782ff2d7d1f13e640a8532b
Android Build Merger (Role) [Fri, 13 Jul 2018 12:47:07 +0000 (12:47 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470 skipped:
e4460d953d
Change-Id: I0f7cd1a1d7e309db38eee7ae86ed761710a9bfb0
Nitin Shivpure [Fri, 13 Jul 2018 12:44:56 +0000 (05:44 -0700)]
[automerger skipped] [automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a am:
ebc968f44e skipped:
eac1fcbb72 am:
53f2d61220 -s ours am:
abceaf0fe7 -s ours
am:
3476c0672b -s ours
Change-Id: If8eb29889e7503c5c004ba1796aaf317fdc4cca2
Android Build Merger (Role) [Fri, 13 Jul 2018 12:43:31 +0000 (12:43 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5 am:
2e08a14470
Change-Id: I6cd95ab6a7bf2509ef888134ff6a4d0aa18f4ac5
Android Build Merger (Role) [Fri, 13 Jul 2018 12:43:29 +0000 (12:43 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683 am:
4a370bbdc5
Change-Id: I289ef3ff584a174372e89b692aee08076e7f97ed
Android Build Merger (Role) [Fri, 13 Jul 2018 12:43:26 +0000 (12:43 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
9bf8cb2683
Change-Id: Ia857465d9a103a44d6219f90bcf606e23a712166
Jakub Pawlowski [Fri, 22 Jun 2018 09:57:19 +0000 (02:57 -0700)]
Fix out of bounds read in l2c_rcv_acl_data
Test: none
Bug:
80432895
Change-Id: I7807d00c02a84c545476e84bc1b71e0718df1f24
Merged-In: I7807d00c02a84c545476e84bc1b71e0718df1f24
Jakub Pawlowski [Fri, 13 Jul 2018 12:42:53 +0000 (12:42 +0000)]
Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into oc-dev
* changes:
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec am:
d4b2b3b5d7 skipped:
cf56f96043
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec am:
d4b2b3b5d7
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b
Fix out of bounds read in l2c_rcv_acl_data
Jakub Pawlowski [Fri, 13 Jul 2018 12:42:53 +0000 (12:42 +0000)]
Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into nyc-mr2-dev
* changes:
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec am:
d4b2b3b5d7
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b
Fix out of bounds read in l2c_rcv_acl_data
Jakub Pawlowski [Fri, 13 Jul 2018 12:42:53 +0000 (12:42 +0000)]
Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into cw-f-dev
* changes:
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b
Fix out of bounds read in l2c_rcv_acl_data
Jakub Pawlowski [Fri, 13 Jul 2018 12:42:53 +0000 (12:42 +0000)]
Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into nyc-mr1-dev
* changes:
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b
Fix out of bounds read in l2c_rcv_acl_data
Jakub Pawlowski [Fri, 13 Jul 2018 12:42:53 +0000 (12:42 +0000)]
Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into nyc-dr1-dev
* changes:
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b
Fix out of bounds read in l2c_rcv_acl_data
Jakub Pawlowski [Fri, 13 Jul 2018 12:42:53 +0000 (12:42 +0000)]
Merge "Fix out of bounds read in l2c_rcv_acl_data" into nyc-dev
Nitin Shivpure [Fri, 13 Jul 2018 12:40:20 +0000 (05:40 -0700)]
[automerger skipped] [automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a am:
ebc968f44e skipped:
eac1fcbb72 am:
53f2d61220 -s ours
am:
abceaf0fe7 -s ours
Change-Id: I867caf50190cb0fc7585d93f0b5d0721f773d19e
Nitin Shivpure [Fri, 13 Jul 2018 12:38:17 +0000 (05:38 -0700)]
[automerger skipped] [automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a am:
ebc968f44e skipped:
eac1fcbb72
am:
53f2d61220 -s ours
Change-Id: I230f807224d71e74bb0c4d662e6c8594831a15aa
Jakub Pawlowski [Fri, 13 Jul 2018 10:42:00 +0000 (03:42 -0700)]
[automerger skipped] Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into oc-dev am:
2008b8b0f1 -s ours am:
2f2259ce16 -s ours am:
d82b5627f2 -s ours
am:
093fd122e1 -s ours
Change-Id: Ideac67b23f537c2bd17a6112de2e502089a3d816
Jakub Pawlowski [Fri, 13 Jul 2018 10:37:57 +0000 (03:37 -0700)]
[automerger skipped] Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into oc-dev am:
2008b8b0f1 -s ours am:
2f2259ce16 -s ours
am:
d82b5627f2 -s ours
Change-Id: I1e5065efe5d41ace502712ba9178a65273a98caf
Jakub Pawlowski [Fri, 13 Jul 2018 10:33:24 +0000 (03:33 -0700)]
[automerger skipped] Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into oc-dev am:
2008b8b0f1 -s ours
am:
2f2259ce16 -s ours
Change-Id: Id5a567c7296bbefcf29d1a65b19548e53bd4c1bf
Jakub Pawlowski [Fri, 13 Jul 2018 10:28:19 +0000 (03:28 -0700)]
[automerger skipped] Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into oc-dev
am:
2008b8b0f1 -s ours
Change-Id: Id81106ed4eef109645758d85ee01e0cc78b84627
Android Build Merger (Role) [Fri, 13 Jul 2018 10:22:46 +0000 (10:22 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a am:
ebc968f44e skipped:
eac1fcbb72
Change-Id: I63533f7e0ec803b590fdf8c294248eb356a2ad59
Android Build Merger (Role) [Fri, 13 Jul 2018 10:22:05 +0000 (10:22 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a am:
ebc968f44e
Change-Id: Ia5da8d8fa0f9e3d0835b7eb6ec5c52182624dc18
Android Build Merger (Role) [Fri, 13 Jul 2018 10:22:03 +0000 (10:22 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a
Change-Id: Iddc60e5f6966d6a7216839cf6b3fed8ff2e83849
Android Build Merger (Role) [Fri, 13 Jul 2018 10:22:00 +0000 (10:22 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8
Change-Id: Iac287ef4964fa4ad8b08bc40c89d8a6b6d5a6ee5
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:57 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013
Change-Id: Ia0a11c3f24a7b6e6a4f892c568513a3bfad987e4
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:54 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23
Change-Id: If437e47efd744648d5549e23793894de40281b10
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:51 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca
Change-Id: I4d7c71a8cec14b94039657bd8de3679a776c473e
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:48 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf
Change-Id: I2dcc552158cfc27c73dec217d7f3e2581adf2426
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:46 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d
Change-Id: I9f5c4155c1def43351058c6cbda5f1258e3888d5
Nitin Shivpure [Tue, 6 Feb 2018 12:48:37 +0000 (18:18 +0530)]
BLE: Don't access freed buffer in log message
When GATT fail to write data on L2CAP, buffer is freed by L2CAP.
Accessing the buffer leads to fatal failure while printing the message info.
Test: BLE discover services and BT off test cases
Fixes:
73018520
Change-Id: I661398fd1321f6e68026b3720db4965fd6584d70
Merged-In: I661398fd1321f6e68026b3720db4965fd6584d70
Jakub Pawlowski [Fri, 13 Jul 2018 10:19:15 +0000 (10:19 +0000)]
Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into oc-dev
* changes:
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2 am:
f4df487103 am:
1e25b32159
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2 am:
f4df487103
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f
Add packet length checks in l2cble_process_sig_cmd
Jakub Pawlowski [Fri, 13 Jul 2018 10:19:15 +0000 (10:19 +0000)]
Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into nyc-mr2-dev
* changes:
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2 am:
f4df487103
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f
Add packet length checks in l2cble_process_sig_cmd
Jakub Pawlowski [Fri, 13 Jul 2018 10:19:15 +0000 (10:19 +0000)]
Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into cw-f-dev
* changes:
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f
Add packet length checks in l2cble_process_sig_cmd