OSDN Git Service
Jakub Pawlowski [Sat, 20 Jan 2018 17:09:59 +0000 (17:09 +0000)]
One less copy when sending LE CoC data. am:
8451931236
am:
46cd2710db
Change-Id: I792c7373d035d8644a46e7831c87e439a4fc2506
Jakub Pawlowski [Sat, 20 Jan 2018 17:07:27 +0000 (17:07 +0000)]
One less copy when sending LE CoC data.
am:
8451931236
Change-Id: Ie63ed4fa3ce9848c9285c25f037bb676370fa569
Jakub Pawlowski [Fri, 12 Jan 2018 14:22:43 +0000 (06:22 -0800)]
One less copy when sending LE CoC data.
After this patch, data is read from socket directly into BT_HDR that is
passed down the stack, rather than copying the data later.
Test: manual
Bug:
68359837
Change-Id: I3f304e6c7e60ce64b44350678d0ba10324fc97bc
Jakub Pawlowski [Sat, 20 Jan 2018 03:50:16 +0000 (03:50 +0000)]
Add Connection Event Min/Max hint to Connection Update Request am:
c194ec1e89
am:
235bbca2a4
Change-Id: Id4194e42c6b504aa83d0b000897a9ab85ed0e5f8
Jakub Pawlowski [Sat, 20 Jan 2018 03:47:42 +0000 (03:47 +0000)]
Add Connection Event Min/Max hint to Connection Update Request
am:
c194ec1e89
Change-Id: I6ccc959a08ecb6c25029ba9b8a03952f7066395b
Jakub Pawlowski [Fri, 19 Jan 2018 19:29:21 +0000 (11:29 -0800)]
Add Connection Event Min/Max hint to Connection Update Request
Bug:
69623109
Test: manual on HA
Change-Id: Idc08d08029f287751fafb4a8e2379dcc118e5ac3
Bailey Forrest [Fri, 19 Jan 2018 21:49:41 +0000 (21:49 +0000)]
Merge "a2dp_source: Use SIZE_MAX queue size for worker_thread" am:
f82e7898bb
am:
0c46edf7be
Change-Id: I19a2e485f55daf44f5c71bae953d02b1897162f0
Bailey Forrest [Fri, 19 Jan 2018 21:47:41 +0000 (21:47 +0000)]
Merge "a2dp_source: Use SIZE_MAX queue size for worker_thread"
am:
f82e7898bb
Change-Id: If74f098483a3cb8116351718f1d53ee8fdd9b157
Treehugger Robot [Fri, 19 Jan 2018 21:41:24 +0000 (21:41 +0000)]
Merge "a2dp_source: Use SIZE_MAX queue size for worker_thread"
minwoo2.kim [Fri, 19 Jan 2018 20:35:32 +0000 (20:35 +0000)]
Merge "SDP: Increase heap buffer size used for A2DP/AVRC" am:
434fc14ef4
am:
63f964bb64
Change-Id: I4bb1382e3c6ec1d1a9b0e6b0f097dc292eb45219
Bailey Forrest [Fri, 19 Jan 2018 20:32:57 +0000 (20:32 +0000)]
Merge "btm_sec_disconnected Check if p_dev_rec is still in scope" am:
d6dad56b4b
am:
610e717c73
Change-Id: I660f363a7845a21d43afa4da827e1e3b8642119b
minwoo2.kim [Fri, 19 Jan 2018 20:32:55 +0000 (20:32 +0000)]
Merge "SDP: Increase heap buffer size used for A2DP/AVRC"
am:
434fc14ef4
Change-Id: I634d2c18a062fc1518614114619827551ea2908c
Bailey Forrest [Fri, 19 Jan 2018 20:30:27 +0000 (20:30 +0000)]
Merge "btm_sec_disconnected Check if p_dev_rec is still in scope"
am:
d6dad56b4b
Change-Id: Iae71e17f3bcf081758d1b9ea85a81a9d43c341c0
Treehugger Robot [Fri, 19 Jan 2018 20:27:47 +0000 (20:27 +0000)]
Merge "SDP: Increase heap buffer size used for A2DP/AVRC"
Treehugger Robot [Fri, 19 Jan 2018 20:25:28 +0000 (20:25 +0000)]
Merge "btm_sec_disconnected Check if p_dev_rec is still in scope"
Myles Watson [Fri, 19 Jan 2018 19:31:03 +0000 (19:31 +0000)]
Remove casts for callbacks am:
fc9eced9bc
am:
574924848f
Change-Id: I65b2112322cf6d82d0e4de3f94f1eafe0f5975c7
Jakub Pawlowski [Fri, 19 Jan 2018 19:30:46 +0000 (19:30 +0000)]
Make GAP_ConnWriteData accept BT_HDR am:
42bdd07088
am:
c724643d39
Change-Id: Id85d40e7b51f415ab1119a2ea592d8249e6ca4b7
Myles Watson [Fri, 19 Jan 2018 19:29:03 +0000 (19:29 +0000)]
Remove casts for callbacks
am:
fc9eced9bc
Change-Id: I4b512ee541e3a32f323cc29d10f51e9e1b8971d3
Jakub Pawlowski [Fri, 19 Jan 2018 19:28:45 +0000 (19:28 +0000)]
Make GAP_ConnWriteData accept BT_HDR
am:
42bdd07088
Change-Id: If4572b3d43c1076feea8ac07032454fcb1b4f535
Myles Watson [Thu, 18 Jan 2018 20:30:55 +0000 (12:30 -0800)]
Remove casts for callbacks
Casting callbacks can hide parameter mismatches from
the compiler, which makes it impossible to check
argument types.
Bug:
72005262
Test: Toggle Bluetooth, connect to a headset
Change-Id: I0c3e0653c77e829655377fbf170d1b03efa5ea32
Bailey Forrest [Fri, 12 Jan 2018 23:52:14 +0000 (15:52 -0800)]
btm_sec_disconnected Check if p_dev_rec is still in scope
|btm_sec_disconnected| may call the callback
|btm_cb.api.p_auth_complete_callback| which can delete |p_dev_rec|.
After deletion, |btm_sec_disconnected| still atempts to use |p_dev_rec|.
Bug:
71913396
Test: Does not crash with a quickly terminated connection.
Change-Id: Ic28beb2888a51090283be04121d785495cf25a84
Jakub Pawlowski [Thu, 18 Jan 2018 02:22:12 +0000 (18:22 -0800)]
Make GAP_ConnWriteData accept BT_HDR
This is next step towards making LE sockets work with zero copies.
Test: transfer file using OPP
Bug:
68359837
Change-Id: Iedcdd59acb223e2982f6cb96b8656f517008dee5
Hemant Gupta [Fri, 19 Jan 2018 01:16:47 +0000 (01:16 +0000)]
Revert "HID: Update condition for checking LE HID handle validity" am:
812d20dfd8
am:
f1cc3e6164
Change-Id: I2eddb42f1e585e4c87d61713a81cb94a3cc03a1c
Hemant Gupta [Fri, 19 Jan 2018 01:07:38 +0000 (01:07 +0000)]
Revert "HID: Update condition for checking LE HID handle validity"
am:
812d20dfd8
Change-Id: Ia541465ba62f3a0c7bb890290f1b2a03925f2756
Stanley Tng [Thu, 18 Jan 2018 18:04:09 +0000 (18:04 +0000)]
Added support for new Android API for LE CoC am:
49dd53cb3d
am:
a1eb49a78f
Change-Id: Ie510183ecaa7bb2bbf6b0cdf6b973c8b7f92d9ef
Stanley Tng [Thu, 18 Jan 2018 17:59:28 +0000 (17:59 +0000)]
Added support for new Android API for LE CoC
am:
49dd53cb3d
Change-Id: If4aa43d5571db2f4c41d1851a486a42804a9efca
minwoo2.kim [Fri, 12 Jan 2018 09:09:04 +0000 (18:09 +0900)]
SDP: Increase heap buffer size used for A2DP/AVRC
This buffer is used to save the attributes parsed from the SDP response
transferred from a peer device.
In Android O, SDP fails sometimes due to full memory from SDP DB.
The reason of this shortage seems to be the increasing of allocated
memory for tSDP_DISC_ATTR.
Android N uses a 32-bit bluetooth lib and 4 bytes of memory for
pointers.
In total, 12 bytes are used for tSDP_DISC_ATTR
Android O uses a 64-bit bluetooth lib and 8 bytes of memory for
pointers.
Now, 24 bytes are used for tSDP_DISC_ATTR.
To match this increase of memory consumption, We need to double the heap
buffer size. (from 1000 to 2000)
bug:
71005276
Test: passed the connection test performed with more than 50 BT devices
launched in the market
Signed-off-by: minwoo kim <minwoo2.kim@lge.com>
Change-Id: I24bb50810e224aa1e23141493b5b2fa3b706c495
Hemant Gupta [Fri, 12 Jan 2018 06:25:47 +0000 (11:55 +0530)]
Revert "HID: Update condition for checking LE HID handle validity"
This reverts commit
af94891aa6e66b0d4b495d60aeac2aa8091c9d33 as changes to
fix same issue already merged via commit
2e3c3d782993c475e608291896db73b0960fa9dd
so this patch is not longer required.
Test: Code analysis for aosp master
Fixes:
71842479
Change-Id: Ifbc2375ad6df7231c85ef30c5e2c5b5d8dde16f0
Bailey Forrest [Thu, 18 Jan 2018 01:57:48 +0000 (17:57 -0800)]
a2dp_source: Use SIZE_MAX queue size for worker_thread
If the queue runs out of space, we can run into a deadlock.
Explanation of the deadlock is in the bug.
If I connect and disconnect ~20 times in quick succession I would
usually run into this issue
Bug:
72121764
Test: Connect/disconnect 170 times with script, issue does not occur.
Change-Id: I0a76e51aa99481f9fe4885b879209b3d215ae5b0
Stanley Tng [Wed, 20 Dec 2017 17:38:30 +0000 (09:38 -0800)]
Added support for new Android API for LE CoC
Added support for the new Android API including the management of the
LE_PSM values.
Also fixed a bug when de-registering the L2CAP CoC, the RCB is not
freed correctly.
Test: Ran the new ACTS Tests for LE CoC and existing ACTS for RfComm
Bug:
70683224
Change-Id: I5a545656bece667e7ba942d7b2334e3f5b49b283
Jakub Pawlowski [Thu, 18 Jan 2018 13:34:04 +0000 (13:34 +0000)]
Limit data accepted by GAP_ConnWriteData to just one SDU am:
ce5f485e67
am:
bfa287eb85
Change-Id: Idc19aa5e5a2fe8d742d4b9d8166667ef4cb833d0
Jakub Pawlowski [Thu, 18 Jan 2018 13:31:31 +0000 (13:31 +0000)]
Limit data accepted by GAP_ConnWriteData to just one SDU
am:
ce5f485e67
Change-Id: I6d91324e7b8347d745a358394403258d02456bae
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
Jakub Pawlowski [Fri, 12 Jan 2018 11:19:33 +0000 (03:19 -0800)]
Limit data accepted by GAP_ConnWriteData to just one SDU
This limit is already enforced in BluetoothSocket.java, which is
dividing data into pieces no bigger than MTU.
This is first step towards making it accept BT_HDR with data, in order
to make LE sockets work with zero copies.
Test: transfer file using OPP
Bug:
68359837
Change-Id: I67bfd4ab5c2dc6aa8210058a742c57e1ccf845a0
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
OSDN Git Service
