OSDN Git Service
Jakub Pawlowski [Thu, 18 Jan 2018 02:23:30 +0000 (02:23 +0000)]
Merge "Make BTA_JvL2capWrite take ownership of the data buffer" am:
00fa787f83
am:
e13fcb8cda
Change-Id: I589bd2296c1374e81c76cc2b9006d6c61ccf74ea
Pavlin Radoslavov [Thu, 18 Jan 2018 02:18:33 +0000 (02:18 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()" am:
94b769b9f3
am:
b652c61044
Change-Id: Ifa92e6e4ee011012b7e17910686e668f1b65e8d2
Jakub Pawlowski [Thu, 18 Jan 2018 02:16:04 +0000 (02:16 +0000)]
Merge "Make BTA_JvL2capWrite take ownership of the data buffer"
am:
00fa787f83
Change-Id: I139a9c76519330023825464558ee47e62f10ace0
Pavlin Radoslavov [Thu, 18 Jan 2018 02:10:42 +0000 (02:10 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
am:
94b769b9f3
Change-Id: I67191c51f005479e8fc16ee24789da1bba8db4ce
Treehugger Robot [Thu, 18 Jan 2018 01:49:54 +0000 (01:49 +0000)]
Merge "Make BTA_JvL2capWrite take ownership of the data buffer"
Jakub Pawlowski [Thu, 18 Jan 2018 01:26:51 +0000 (01:26 +0000)]
Fix buffer overflow in GAP_ConnWriteData am:
00c922a091
am:
60b02a72a2
Change-Id: I5257934b9b05492f06de2b17d9cc9597da80e71c
Jakub Pawlowski [Thu, 18 Jan 2018 01:18:45 +0000 (01:18 +0000)]
Fix buffer overflow in GAP_ConnWriteData
am:
00c922a091
Change-Id: Ice8b45329a9351542d1cecc1cb4b5e3429f45a79
Treehugger Robot [Thu, 18 Jan 2018 00:46:57 +0000 (00:46 +0000)]
Merge "Added internal API getMaxConnectedAudioDevices()"
Jakub Pawlowski [Thu, 11 Jan 2018 15:34:39 +0000 (07:34 -0800)]
Make BTA_JvL2capWrite take ownership of the data buffer
This is first step towards making it accept BT_HDR with data, in order
to make LE sockets work with zero copies.
Bug:
68359837
Test: transfer file using OPP
Change-Id: Ib202520554bbc83cb8587bf1c4caa4b0da6b266c
Jakub Pawlowski [Mon, 8 Jan 2018 21:06:45 +0000 (13:06 -0800)]
Fix buffer overflow in GAP_ConnWriteData
Bug: none
Test: exchange data with MPS>11000, sent file between devices using OPP
Change-Id: Ie456a35da4764bdac329135742634ce8f0a63469
Pavlin Radoslavov [Wed, 17 Jan 2018 10:19:42 +0000 (02:19 -0800)]
Added internal API getMaxConnectedAudioDevices()
The API can be used to obtain the maximum number of connected
devices for A2DP or HFP.
Test: Manual
Bug:
64767509
Change-Id: Ide01ea91bc9708b20c78266d791d4775be3f943d
Hansong Zhang [Wed, 17 Jan 2018 01:43:43 +0000 (01:43 +0000)]
Merge "Revert "Fix buffer overflow in GAP_ConnWriteData"" am:
115a92883d
am:
3f37df9c4d
Change-Id: I6a118850c76ef27a076e2ce3d59661596e4689f2
Hansong Zhang [Wed, 17 Jan 2018 01:40:04 +0000 (01:40 +0000)]
Merge "Revert "Fix buffer overflow in GAP_ConnWriteData""
am:
115a92883d
Change-Id: I27c3e98dce3a2f3eb4ce44c2b7f4c0726f8fb76d
Treehugger Robot [Wed, 17 Jan 2018 01:33:46 +0000 (01:33 +0000)]
Merge "Revert "Fix buffer overflow in GAP_ConnWriteData""
Hansong Zhang [Tue, 16 Jan 2018 23:57:27 +0000 (23:57 +0000)]
Revert "Fix buffer overflow in GAP_ConnWriteData"
This reverts commit
9f9c47683e28a0cf99b308deeac04073a9528c59.
Reason for revert: Bluetooth OPP crashing.
Bug:
72049058
Change-Id: Ic9ee9f28ce480453a9e01d3273595bff2264cd2b
Myles Watson [Tue, 16 Jan 2018 18:53:41 +0000 (18:53 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4 am:
b92debbd19 am:
0e69fe96e7 am:
00a4610749 am:
eacc3e945c -s ours am:
8dc92c8278 -s ours am:
f98ffdb9f3 -s ours
am:
a1d3f370aa -s ours
Change-Id: I96ee5d094ede0a52d092401c27103b01c1e96aba
Myles Watson [Tue, 16 Jan 2018 18:48:38 +0000 (18:48 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4 am:
b92debbd19 am:
0e69fe96e7 am:
00a4610749 am:
eacc3e945c -s ours am:
8dc92c8278 -s ours
am:
f98ffdb9f3 -s ours
Change-Id: Iadaec6ab08eb3912e0b135b3b9740bed3ca89f3a
Myles Watson [Tue, 16 Jan 2018 18:42:33 +0000 (18:42 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4 am:
b92debbd19 am:
0e69fe96e7 am:
00a4610749 am:
eacc3e945c -s ours
am:
8dc92c8278 -s ours
Change-Id: Ie10658e4c074b591f470e3faa2763eb6807b8406
Myles Watson [Tue, 16 Jan 2018 18:38:01 +0000 (18:38 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4 am:
b92debbd19 am:
0e69fe96e7 am:
00a4610749
am:
eacc3e945c -s ours
Change-Id: I4a3bdd2e6dc5688500c4c10704669ba874bac2ff
Myles Watson [Tue, 16 Jan 2018 18:33:06 +0000 (18:33 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4 am:
b92debbd19 am:
0e69fe96e7
am:
00a4610749
Change-Id: I749c16b970ce622161f073f9a15a51b8b09887ca
Myles Watson [Tue, 16 Jan 2018 18:28:28 +0000 (18:28 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4 am:
b92debbd19
am:
0e69fe96e7
Change-Id: I1cf83ae6e68124da3afc3f8fc7884d3e12587b80
Myles Watson [Tue, 16 Jan 2018 18:24:21 +0000 (18:24 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd am:
510601cbb4
am:
b92debbd19
Change-Id: I4e66566e973a8443537f85715dcd9a18ae639d07
Myles Watson [Tue, 16 Jan 2018 18:12:53 +0000 (18:12 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c am:
0f9c39d5cd
am:
510601cbb4
Change-Id: I95f12990cbc975453460aa18ab125bf571add95d
Myles Watson [Tue, 16 Jan 2018 18:08:23 +0000 (18:08 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d am:
1c4f74e02c
am:
0f9c39d5cd
Change-Id: I56a016ee9e1459472e97a341b8cbc9b8253b230b
Myles Watson [Tue, 16 Jan 2018 18:07:27 +0000 (18:07 +0000)]
Merge "SDP: Include the offset in sdp_disc_server_rsp" into oc-dev am:
df98b22809 am:
0b11422ad2
am:
57e3f91682
Change-Id: I14903033eadda2f5d074ce60a2d75751643a084b
Myles Watson [Tue, 16 Jan 2018 18:03:20 +0000 (18:03 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4 am:
1f573b136d
am:
1c4f74e02c
Change-Id: I160dce825ef9490fea2c9614472d4bb2477cfb40
Myles Watson [Tue, 16 Jan 2018 17:58:52 +0000 (17:58 +0000)]
Merge "SDP: Include the offset in sdp_disc_server_rsp" into oc-dev am:
df98b22809
am:
0b11422ad2
Change-Id: I55b058bbd60d190a5de5949eb23c5b158c6097a8
Myles Watson [Tue, 16 Jan 2018 17:58:18 +0000 (17:58 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am:
f3c40264c4
am:
1f573b136d
Change-Id: I2d2d968c09bc690ec03ee54a1a4060ef2ba71eac
Myles Watson [Tue, 16 Jan 2018 17:53:52 +0000 (17:53 +0000)]
Merge "SDP: Include the offset in sdp_disc_server_rsp" into oc-dev
am:
df98b22809
Change-Id: I0124a1fb390867e6faecc00d887712d096d07dda
Myles Watson [Tue, 16 Jan 2018 17:53:49 +0000 (17:53 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
am:
f3c40264c4
Change-Id: I22c76d476befb51d5e8b8c1d5557e711d8949507
TreeHugger Robot [Tue, 16 Jan 2018 17:46:17 +0000 (17:46 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
TreeHugger Robot [Tue, 16 Jan 2018 17:46:14 +0000 (17:46 +0000)]
Merge "SDP: Include the offset in sdp_disc_server_rsp" into oc-dev
Ajay Panicker [Sat, 13 Jan 2018 05:28:26 +0000 (05:28 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a am:
f9d07e37fa am:
2a8638c939 am:
0daa921541 am:
89ec0b650b -s ours am:
d5afac9258 am:
c82d8dec49
am:
2b0fe05db9
Change-Id: Ie4b91c22eda1fcff52b1672e59ce1af65a3f65b6
Ajay Panicker [Sat, 13 Jan 2018 05:27:59 +0000 (05:27 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033 am:
6c5d8c52b1 am:
1b601dde3c am:
b83b14d8d9 am:
3d05bc5b79 -s ours am:
b1fc877817 am:
b73b9edfd3
am:
e142d90390
Change-Id: I1108e96fc68531f45de94aa0fbae64bbf45f8db0
Ajay Panicker [Sat, 13 Jan 2018 05:27:35 +0000 (05:27 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500 am:
81b581d311 am:
201090a46b am:
19607d5aa6 am:
2e98875389 -s ours am:
fd9d136008 am:
b8b926932a
am:
6861e6d281
Change-Id: I1f239809bcb402c6f9e0b539db19bc12e084ba75
Myles Watson [Sat, 13 Jan 2018 05:27:14 +0000 (05:27 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours am:
f1fb6a9a40 -s ours am:
8340e7985c -s ours am:
cc6e8864a9 -s ours am:
d3135d932d -s ours am:
13c8570f4d -s ours am:
c7f7e2a2ad -s ours
am:
12aa378648 -s ours
Change-Id: I8d20472409938033ebaab682d6a5369bbdccb9e6
Myles Watson [Sat, 13 Jan 2018 05:26:49 +0000 (05:26 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours am:
f0a0bd2150 -s ours am:
33c34c6187 -s ours am:
fe274a6544 -s ours am:
25cec205f9 -s ours am:
cc2865600d -s ours
am:
338daa7ad6 -s ours
Change-Id: Ibbc43c887d853f3eb6706d1f6d8ec7270f38db64
Ajay Panicker [Sat, 13 Jan 2018 05:26:17 +0000 (05:26 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45 am:
7a26c58e12 am:
335bda7c4d am:
a2aa7fe13f -s ours am:
a4ee1a73db am:
0d4651cba4
am:
e4fdfd7c84
Change-Id: I7a0fc76c3b15d5b17adfa909067a02fd045ac2b2
Ajay Panicker [Sat, 13 Jan 2018 05:25:40 +0000 (05:25 +0000)]
Merge "AVRCP: Check the number of text attributes requested" into oc-dev am:
8f3a82d17a am:
1846da96cb
am:
828b9f355a
Change-Id: I5aedb7b15fc1cdc1610e02b3aef77dad7986689a
Myles Watson [Sat, 13 Jan 2018 05:25:09 +0000 (05:25 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630 am:
b4cfd05ab3 am:
8502e4862d am:
56cd06f031 am:
138fd6babf -s ours am:
6123aedafe -s ours am:
7dd771c673 -s ours
am:
7a99c77517 -s ours
Change-Id: I2cc94f582f95bcf015d2d6ecdb8fa26f2ca580ce
Myles Watson [Sat, 13 Jan 2018 05:24:24 +0000 (05:24 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa am:
7158d558cf am:
9b46b1e674 am:
22fe062fd8 am:
09cfdf316a -s ours am:
c57972e5b5 -s ours am:
c8c97fa036 -s ours
am:
7fc1c27c16 -s ours
Change-Id: Ic8c8136560453bfb2beb3378b143d41a371beaa7
Stanley Tng [Sat, 13 Jan 2018 05:23:42 +0000 (05:23 +0000)]
Merge "Remove memory reference to invalid mem in error log" into oc-dev am:
ce6cf16714 -s ours am:
d5d1569ba5 -s ours
am:
f3255f231b -s ours
Change-Id: If04779a08a59499c91cc26394e0942472eca53f9
Myles Watson [Sat, 13 Jan 2018 05:23:18 +0000 (05:23 +0000)]
BNEP: Check received frame type am:
b910734a55 am:
62ca97268e
am:
b11f7ad542
Change-Id: I6189c1818465e8d0c40e4b4918816aa43bc6185f
Ajay Panicker [Sat, 13 Jan 2018 02:39:42 +0000 (02:39 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a am:
f9d07e37fa am:
2a8638c939 am:
0daa921541 am:
89ec0b650b -s ours am:
d5afac9258
am:
c82d8dec49
Change-Id: I82fcfb5d5b7de46235307d2a8528cd2cabf5b268
Ajay Panicker [Sat, 13 Jan 2018 02:31:08 +0000 (02:31 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a am:
f9d07e37fa am:
2a8638c939 am:
0daa921541 am:
89ec0b650b -s ours
am:
d5afac9258
Change-Id: I6cdb0941e68efe35ab1efed96c70ab0691856e17
Ajay Panicker [Sat, 13 Jan 2018 02:28:37 +0000 (02:28 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a am:
f9d07e37fa am:
2a8638c939 am:
0daa921541
am:
89ec0b650b -s ours
Change-Id: I08971172cd73ddc098aaa571b153eee84d163dbb
Ajay Panicker [Sat, 13 Jan 2018 02:22:04 +0000 (02:22 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a am:
f9d07e37fa am:
2a8638c939
am:
0daa921541
Change-Id: I00f724417c2c0b57810f5772fa21e31b434c5e40
Ajay Panicker [Sat, 13 Jan 2018 02:17:25 +0000 (02:17 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033 am:
6c5d8c52b1 am:
1b601dde3c am:
b83b14d8d9 am:
3d05bc5b79 -s ours am:
b1fc877817
am:
b73b9edfd3
Change-Id: I5fd89ce51a1a8e3c556a16cd65c3c874448366df
Ajay Panicker [Sat, 13 Jan 2018 02:17:05 +0000 (02:17 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500 am:
81b581d311 am:
201090a46b am:
19607d5aa6 am:
2e98875389 -s ours am:
fd9d136008
am:
b8b926932a
Change-Id: I9057393e83a30fccac56f9cea9b4a19fa59c8373
Ajay Panicker [Sat, 13 Jan 2018 02:17:01 +0000 (02:17 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a am:
f9d07e37fa
am:
2a8638c939
Change-Id: Icc24d0d12d7d435491bf2941608c40fddb959834
Ajay Panicker [Sat, 13 Jan 2018 02:09:42 +0000 (02:09 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours am:
66cda0073a
am:
f9d07e37fa
Change-Id: I9860cc0aca5bba8682babfc64a9751cd547ede8f
Ajay Panicker [Sat, 13 Jan 2018 02:08:51 +0000 (02:08 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033 am:
6c5d8c52b1 am:
1b601dde3c am:
b83b14d8d9 am:
3d05bc5b79 -s ours
am:
b1fc877817
Change-Id: I099689bef911337d0860fe468ee5a0c2985dee8e
Ajay Panicker [Sat, 13 Jan 2018 02:08:31 +0000 (02:08 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500 am:
81b581d311 am:
201090a46b am:
19607d5aa6 am:
2e98875389 -s ours
am:
fd9d136008
Change-Id: If156489df4e8f071068e226dbd11b2f4910041ae
Ajay Panicker [Sat, 13 Jan 2018 02:03:56 +0000 (02:03 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4 am:
786be83578 -s ours
am:
66cda0073a
Change-Id: I6d65606a09c8b1dba7bb5d23e4463af534abf852
Ajay Panicker [Sat, 13 Jan 2018 02:02:43 +0000 (02:02 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033 am:
6c5d8c52b1 am:
1b601dde3c am:
b83b14d8d9
am:
3d05bc5b79 -s ours
Change-Id: I583c0213873ef2e77243eee8edf26a9048fe9f88
Ajay Panicker [Sat, 13 Jan 2018 02:02:27 +0000 (02:02 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500 am:
81b581d311 am:
201090a46b am:
19607d5aa6
am:
2e98875389 -s ours
Change-Id: I54fc2e5b7547b87cd8ff8894bcb77bafaeff1f22
Ajay Panicker [Sat, 13 Jan 2018 01:59:21 +0000 (01:59 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699 am:
45490dc0b4
am:
786be83578 -s ours
Change-Id: Ie6a054ff92fb0fe993d900b0c4a3873bb62e097e
Ajay Panicker [Sat, 13 Jan 2018 01:55:12 +0000 (01:55 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033 am:
6c5d8c52b1 am:
1b601dde3c
am:
b83b14d8d9
Change-Id: I2852da99354c858d0f0879dee1ec5e81c04d979e
Ajay Panicker [Sat, 13 Jan 2018 01:54:54 +0000 (01:54 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500 am:
81b581d311 am:
201090a46b
am:
19607d5aa6
Change-Id: Ic8af3f38856ec2be7dffa347c04432cb517c265a
Ajay Panicker [Sat, 13 Jan 2018 01:53:55 +0000 (01:53 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6 am:
9f936a8699
am:
45490dc0b4
Change-Id: Ifaa0e2129b7dbea668016813d969b94fd8c45960
Myles Watson [Sat, 13 Jan 2018 01:50:43 +0000 (01:50 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours am:
f1fb6a9a40 -s ours am:
8340e7985c -s ours am:
cc6e8864a9 -s ours am:
d3135d932d -s ours am:
13c8570f4d -s ours
am:
c7f7e2a2ad -s ours
Change-Id: Ifb0a9066094bf851e64fc7ecbc7bd7a954e5f515
Myles Watson [Sat, 13 Jan 2018 01:50:21 +0000 (01:50 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours am:
f0a0bd2150 -s ours am:
33c34c6187 -s ours am:
fe274a6544 -s ours am:
25cec205f9 -s ours
am:
cc2865600d -s ours
Change-Id: Id56b9f845577ce5600f1ab4b990b916da72a2b90
Ajay Panicker [Sat, 13 Jan 2018 01:50:09 +0000 (01:50 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033 am:
6c5d8c52b1
am:
1b601dde3c
Change-Id: I649e82377c13a8a19b398729cb84b65243c04c06
Ajay Panicker [Sat, 13 Jan 2018 01:49:56 +0000 (01:49 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45 am:
7a26c58e12 am:
335bda7c4d am:
a2aa7fe13f -s ours am:
a4ee1a73db
am:
0d4651cba4
Change-Id: I15b1116837848f12e54b2e20cb8132cf394da449
Ajay Panicker [Sat, 13 Jan 2018 01:49:52 +0000 (01:49 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500 am:
81b581d311
am:
201090a46b
Change-Id: Ibf437c7127c08d08b9edf02d719689f7a8ba54fb
Ajay Panicker [Sat, 13 Jan 2018 01:46:26 +0000 (01:46 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours am:
876f7a2033
am:
6c5d8c52b1
Change-Id: I7e3df3f9df1904c5515f98756b00a1b3d0951dbf
Myles Watson [Sat, 13 Jan 2018 01:46:15 +0000 (01:46 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours am:
f1fb6a9a40 -s ours am:
8340e7985c -s ours am:
cc6e8864a9 -s ours am:
d3135d932d -s ours
am:
13c8570f4d -s ours
Change-Id: I5ccffee0736cbad3ce282083084e4b73fa136a84
Myles Watson [Sat, 13 Jan 2018 01:45:53 +0000 (01:45 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours am:
f0a0bd2150 -s ours am:
33c34c6187 -s ours am:
fe274a6544 -s ours
am:
25cec205f9 -s ours
Change-Id: I35a626c78628e0cb1cb05ab0d28f93cb1c296bce
Ajay Panicker [Sat, 13 Jan 2018 01:45:25 +0000 (01:45 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45 am:
7a26c58e12 am:
335bda7c4d am:
a2aa7fe13f -s ours
am:
a4ee1a73db
Change-Id: I7f340e1a0cb5f707e313bfe448b994f9fa38f404
Ajay Panicker [Sat, 13 Jan 2018 01:45:20 +0000 (01:45 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev am:
4207e26df6
am:
9f936a8699
Change-Id: Ie5405de54e55239946d2cf608f0fe1d7e2229dc3
Ajay Panicker [Sat, 13 Jan 2018 01:44:29 +0000 (01:44 +0000)]
Merge "AVRCP: Check the number of text attributes requested" into oc-dev am:
8f3a82d17a
am:
1846da96cb
Change-Id: I33c322e779758c9d4806701408e8949a0fd233d4
Ajay Panicker [Sat, 13 Jan 2018 01:40:49 +0000 (01:40 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75 am:
b70b57eaf8 -s ours
am:
876f7a2033
Change-Id: I0c87bf60a4c0cd1f46ad1fdf1d79e650d2918456
Ajay Panicker [Sat, 13 Jan 2018 01:40:49 +0000 (01:40 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev am:
37534db500
am:
81b581d311
Change-Id: Ie3ba63f7d87ea51c41ce3a741305b3ba64fa1b0e
Myles Watson [Sat, 13 Jan 2018 01:40:29 +0000 (01:40 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours am:
f1fb6a9a40 -s ours am:
8340e7985c -s ours am:
cc6e8864a9 -s ours
am:
d3135d932d -s ours
Change-Id: I18f7610720cab40a0b0082ab5a19508c38ad7e39
Myles Watson [Sat, 13 Jan 2018 01:40:12 +0000 (01:40 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours am:
f0a0bd2150 -s ours am:
33c34c6187 -s ours
am:
fe274a6544 -s ours
Change-Id: I59abde97c92c16d918def58e33877963280ebc7a
Ajay Panicker [Sat, 13 Jan 2018 01:39:51 +0000 (01:39 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev
am:
4207e26df6
Change-Id: I187de7f4dd45ea3fa3b6921d0d2ec54d23da9b81
Ajay Panicker [Sat, 13 Jan 2018 01:39:48 +0000 (01:39 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45 am:
7a26c58e12 am:
335bda7c4d
am:
a2aa7fe13f -s ours
Change-Id: Ibf22da15b0bba4597acc38a64a202d632fdddfff
Ajay Panicker [Sat, 13 Jan 2018 01:36:19 +0000 (01:36 +0000)]
Merge "AVRCP: Check the number of text attributes requested" into oc-dev
am:
8f3a82d17a
Change-Id: I388cfb6259d5a2c4bf31a6c97a75b2656f681faa
Ajay Panicker [Sat, 13 Jan 2018 01:36:16 +0000 (01:36 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev
am:
37534db500
Change-Id: I3307b3b4d8b42e729ba1a1e0fcfcf880eb3101c1
Ajay Panicker [Sat, 13 Jan 2018 01:36:13 +0000 (01:36 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654 am:
12d12aac75
am:
b70b57eaf8 -s ours
Change-Id: Ifdb9178a0d6ba8655f5b7c93405b6155dd1afe33
Ajay Panicker [Sat, 13 Jan 2018 01:33:24 +0000 (01:33 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd am:
d95e0eb654
am:
12d12aac75
Change-Id: I1714e438cbd56e7ffe14e5f260adf0eed8100f70
Myles Watson [Sat, 13 Jan 2018 01:32:24 +0000 (01:32 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours am:
f1fb6a9a40 -s ours am:
8340e7985c -s ours
am:
cc6e8864a9 -s ours
Change-Id: Ie5d57ed45daf2b0e94b1bda8346c92912701619b
Myles Watson [Sat, 13 Jan 2018 01:32:08 +0000 (01:32 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours am:
f0a0bd2150 -s ours
am:
33c34c6187 -s ours
Change-Id: I2fdcd0703c3ee3c192e2724899853e85b552013f
Ajay Panicker [Sat, 13 Jan 2018 01:31:46 +0000 (01:31 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45 am:
7a26c58e12
am:
335bda7c4d
Change-Id: I4e40e8dc5fe42ccbc475849f5769042068d7ad57
Ajay Panicker [Sat, 13 Jan 2018 01:30:01 +0000 (01:30 +0000)]
Merge "AVRCP: Check the number of text attributes requested" into oc-dev
Ajay Panicker [Sat, 13 Jan 2018 01:29:56 +0000 (01:29 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into nyc-dev
Ajay Panicker [Sat, 13 Jan 2018 01:29:51 +0000 (01:29 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text attributes requested" into mnc-dev
Ajay Panicker [Sat, 13 Jan 2018 01:27:12 +0000 (01:27 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev am:
90368e62cd
am:
d95e0eb654
Change-Id: I65c4d588423ca11d897d86c11dc65f13004bdfb5
Myles Watson [Sat, 13 Jan 2018 01:26:16 +0000 (01:26 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours am:
f1fb6a9a40 -s ours
am:
8340e7985c -s ours
Change-Id: I1a8fa2e5fae44959a3ec03fbf2032df9276089cd
Myles Watson [Sat, 13 Jan 2018 01:26:09 +0000 (01:26 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630 am:
b4cfd05ab3 am:
8502e4862d am:
56cd06f031 am:
138fd6babf -s ours am:
6123aedafe -s ours
am:
7dd771c673 -s ours
Change-Id: I416a9ba98cc75f422ad9403aa5db88050f3d7470
Myles Watson [Sat, 13 Jan 2018 01:25:55 +0000 (01:25 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours am:
325785a28e -s ours
am:
f0a0bd2150 -s ours
Change-Id: I47f6f6a0e16aa3a21bc5c5e31b53bd4c5df0c0c7
Myles Watson [Sat, 13 Jan 2018 01:25:38 +0000 (01:25 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa am:
7158d558cf am:
9b46b1e674 am:
22fe062fd8 am:
09cfdf316a -s ours am:
c57972e5b5 -s ours
am:
c8c97fa036 -s ours
Change-Id: I0082a3257d33bede54072e364bbb40aa23e22d8d
Ajay Panicker [Sat, 13 Jan 2018 01:25:24 +0000 (01:25 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820 am:
b0c0a69f45
am:
7a26c58e12
Change-Id: Icfbf6a3498f6c1c13e2a4329f9e1289f5e058553
Ajay Panicker [Sat, 13 Jan 2018 01:20:49 +0000 (01:20 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into mnc-dev
am:
90368e62cd
Change-Id: Ie5c417600fe460bef706cc6db879fb1ddbd37eb7
Myles Watson [Sat, 13 Jan 2018 01:20:20 +0000 (01:20 +0000)]
BNEP: Check received frame type am:
61e561d8b7 am:
fa946e7bd8 am:
661e71faaf am:
df4385a4f0 -s ours am:
4c5e6785e0 -s ours
am:
f1fb6a9a40 -s ours
Change-Id: Ia688f80ab38e7ff5771fa0c0550c48d916d1d60d
Myles Watson [Sat, 13 Jan 2018 01:19:46 +0000 (01:19 +0000)]
Merge "PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback" into mnc-dev am:
7cfaf8724e am:
8fa876b282 am:
27626267a5 am:
52de7b9029 -s ours am:
54d56dce26 -s ours
am:
325785a28e -s ours
Change-Id: I19bd48a00903e888ad9b758b1b8c1a7ec23c10eb
Ajay Panicker [Sat, 13 Jan 2018 01:19:15 +0000 (01:19 +0000)]
Merge "DO NOT MERGE: AVRCP: Check the number of text value attributes requested" into nyc-dev am:
e71013a820
am:
b0c0a69f45
Change-Id: I5213c3a1a5b8a75330e09f08858f3dd394cbcfbe
Myles Watson [Sat, 13 Jan 2018 01:18:38 +0000 (01:18 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630 am:
b4cfd05ab3 am:
8502e4862d am:
56cd06f031 am:
138fd6babf -s ours
am:
6123aedafe -s ours
Change-Id: Iad65834ed4244f7de543120f9d051a597c88e098
Myles Watson [Sat, 13 Jan 2018 01:18:14 +0000 (01:18 +0000)]
PAN: Fix Use-after-free in bta_pan_data_buf_ind_cback am:
bcad4b57fa am:
7158d558cf am:
9b46b1e674 am:
22fe062fd8 am:
09cfdf316a -s ours
am:
c57972e5b5 -s ours
Change-Id: I659ecb5b1f921e926e0057e64d9d479739c4b7e4
Myles Watson [Sat, 13 Jan 2018 01:16:42 +0000 (01:16 +0000)]
Merge "BNEP: Check received frame type" into nyc-dev am:
3f25ecf630 am:
b4cfd05ab3 am:
8502e4862d am:
56cd06f031
am:
138fd6babf -s ours
Change-Id: Iba28c0f20a1221bc2969dd368dac9e7304c422fc
OSDN Git Service
