OSDN Git Service
Srinu Jella [Thu, 9 Jun 2016 00:50:41 +0000 (00:50 +0000)]
Set disable timer in case of any active ACL connection
am:
70035577fd
Change-Id: Ibd241e1dc6608a96576d9d4db4dcdd16f7c0d383
Srinu Jella [Wed, 8 Jun 2016 10:20:53 +0000 (15:50 +0530)]
Set disable timer in case of any active ACL connection
Use Case: Disable time out when atleast one active ACL connections
Steps:
1. Turn ON Bluetooth
2. Connect to any Headset
3. Turn OFF bluetooth.
Failure: Turn OFF bluetooth is failed when atleast one active ACL connections
Root Cause:i If we have one or more active ACL links, so it is not notitying
BTA_DM_DISABLE_EVT to upper layer.
Fix: Set disable timer in case of any active ACL connection
Bug:
29217385
Change-Id: Ica47717119f1ab9fa9f4f5244e8483c408276a2a
(cherry picked from commit
3e4f01ada8c1627bd48f31cd0c8269984b8e5f96)
Myles Watson [Wed, 8 Jun 2016 22:08:44 +0000 (22:08 +0000)]
Merge \"btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result\" into nyc-dev
am:
59bc2de906
Change-Id: I9234f8a567883fdbccb20326328f9cdb444de479
TreeHugger Robot [Wed, 8 Jun 2016 22:03:23 +0000 (22:03 +0000)]
Merge "btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result" into nyc-dev
Subramanian Srinivasan [Wed, 8 Jun 2016 01:33:58 +0000 (01:33 +0000)]
Merge \"Fix payload size for GATT Read by type request\" into nyc-dev
am:
73ee3314ed
Change-Id: I449e8aa3437ac39f8786d82dbfb6a320d1ba51d7
Venkata Jagadeesh [Wed, 8 Jun 2016 01:33:58 +0000 (01:33 +0000)]
Merge \"Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel\" into nyc-dev
am:
e67263c5e6
Change-Id: Id7cb7cc9d1d10138a3233562513c5bf96090b73a
TreeHugger Robot [Wed, 8 Jun 2016 01:30:28 +0000 (01:30 +0000)]
Merge "Fix payload size for GATT Read by type request" into nyc-dev
Pankaj Kanwar [Wed, 8 Jun 2016 01:28:49 +0000 (01:28 +0000)]
Merge "Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel" into nyc-dev
Nitin Arora [Wed, 8 Jun 2016 01:05:07 +0000 (01:05 +0000)]
Remote device changes for SMP certification
am:
9ded3b71de
Change-Id: I94cf61e64d92b8bf2658941059507958c7feec75
Subramanian Srinivasan [Fri, 27 May 2016 23:32:55 +0000 (16:32 -0700)]
Fix payload size for GATT Read by type request
Payload size for GATT Read by type request for UUID32 and UUID128
are incorrectly allocated. This leads to memory overflow when
Read by type request is sent for them and eventually results
in crash during free. This change makes sure that the payload
can accomodate upto 128 bit UUID.
This crash is observed while running TC_GAR_CL_BV_03_C Qual test
case.
Bug:
29011042
Change-Id: Ib2b41b769b394670099f4549f204e2972f7df876
(cherry picked from commit
7da98621a4dfa8196b8d20e8955ad508f540e5d9)
Venkata Jagadeesh [Fri, 27 May 2016 10:06:20 +0000 (15:36 +0530)]
Reject L2CAP INFO RSP and ECHO RSP on the LE signaling channel
Steps:
Execute TC_LE_REJ_BI_02_C
Failure:
PTS stuck after sending INFO RSP, ECHO RSP on the LE signaling channel
Root Cause:
The Bluetooth stack is not rejecting INFO RSP, ECHO RSP even though
these commands are invalid for the LE signaling Channel.
Fix:
Reject the INFO RSP, ECHO RSP with error L2CAP_CMD_REJ_NOT_UNDERSTOOD.
Bug:
27852645
Change-Id: Ie09f658d606206cbdbea928e8cb6d10332743cf4
(cherry picked from commit
d35bb40dd563e7f37df0a2fa9c0f61d0958b9601)
Myles Watson [Tue, 7 Jun 2016 23:14:18 +0000 (16:14 -0700)]
btm: Restrict EXTENDED_INQUIRY_RESULT to 1 result
The spec only allows one result per event.
Abort processing and return if the spec is not followed.
Bug:
29141745
Change-Id: Ic414b28adadec274779b0d953d12d499a619aff6
Signed-off-by: Myles Watson <mylesgw@google.com>
Nitin Arora [Tue, 15 Mar 2016 22:00:36 +0000 (15:00 -0700)]
Remote device changes for SMP certification
Use Case:
Certification test cases for SMP require various scenarios
where the remote device needs to show a specific behavior
where it fails the pairing in a certain way, and the DUT is
required to abort the pairing properly.
In abcense of a proper PTS suite to execute these test cases,
we can use another device running the same host by configuring
certain run time property.
Test Cases:
TP/SCJW/BI-02-C
TP/SCJW/BV-02-C
TP/SCPK/BI-03-C
TP/SCPK/BI-04-C
TP/SCPK/BV-02-C
TP/SCPK/BV-03-C
TP/SCJW/BI-01-C
TP/SCCT/BV-01-C
TP/SCCT/BV-02-C
TP/SCPK/BI-01-C
TP/SCPK/BI-02-C
TP/SCPK/BV-04-C
TP/SCPK/BV-01-C
Fix:
Added a property in the bt_stack.conf file. The property name
is "SmpFailureCase". The values 2 to 6(inclusive), are forcausing SMP
failures with various failure reasons.
Failure case 1 and 9 are for producing error "Confirm value failure".
Cases 7 and 8 are for generating specific errors at pair cancel.
Note:
The default use of this feature is controlled using a compile
time flag BTM_BLE_SMP_CERTIFICATION.
The BTM_BLE_SMP_CERTIFICATION = TRUE is needed only while we
wait for the PTS support for the LE Secure connections.
Bug:
27852645
Change-Id: I1f7a8ff2659d85b5978b75870c57162a34d394d0
(cherry picked from commit
0bd0c8fc88a7141691a7ca839b11cb711945ee33)
JivakDhadse [Tue, 7 Jun 2016 00:15:33 +0000 (00:15 +0000)]
Merge "Revert "DO NOT MERGE Proper construction of AVDTP general reject message"" into nyc-dev
am:
a3f785a138
* commit '
a3f785a138ab67c6533de4f427e777c222e4352e':
Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
Change-Id: I180dcc5e72104217af72311be8b1eb0bb38464d4
Nitin Arora [Tue, 7 Jun 2016 00:15:32 +0000 (00:15 +0000)]
Merge "Clear BLE block from device records at unpair" into nyc-dev
am:
8c919fb37a
* commit '
8c919fb37a56f3a6a2e30564e1356bf93c468b5a':
Clear BLE block from device records at unpair
Change-Id: Iee861ef44ca133bf4d2c0a1604a134d86a8c202d
Pankaj Kanwar [Tue, 7 Jun 2016 00:09:01 +0000 (00:09 +0000)]
Merge "Revert "DO NOT MERGE Proper construction of AVDTP general reject message"" into nyc-dev
Pankaj Kanwar [Tue, 7 Jun 2016 00:07:46 +0000 (00:07 +0000)]
Merge "Clear BLE block from device records at unpair" into nyc-dev
Navin Kochar [Mon, 6 Jun 2016 20:30:06 +0000 (20:30 +0000)]
Fix for issue introduced due to rebase of LE L2CAP COC
am:
be3f7f9d24
* commit '
be3f7f9d244ca39a9a5a27afd3b117f83b69e0e4':
Fix for issue introduced due to rebase of LE L2CAP COC
Change-Id: Ibe88def5c20b8192e16db4c723c539c41921d9f7
Nitin Arora [Mon, 25 Apr 2016 21:47:51 +0000 (14:47 -0700)]
Clear BLE block from device records at unpair
Use Case:
Pair and unpair LE remote device repeatedly. The repair
intermittently fails with the error "DHKey Check Failure"
Failure:
Pairing failure is observed when pairing is performed
after unpairing, without performing a BT reset.
Further analysis of the SMP logs indicate that DUT uses the
static address of the remote device for calculation of the
MacKey value. At the time of pairing, the remote RPA should
be used (and the static address has not yet been distributed either).
The problem is caused by the previous dev record which is left in
the stack, and at the time of repair, stack picks the old device
record and reuses it.
Fix:
This change removes the entire BLE block from the device record,
after the unpairing is performed, so that a new device record
is allocated, after the repairing is done.
Bug:
27852645
Change-Id: I8d605d1bb3b1c32061a8d8a7a7fe0fe200030abc
JivakDhadse [Fri, 7 Aug 2015 13:28:38 +0000 (18:58 +0530)]
Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
This reverts commit
2ed10d442266eade44be121cd24fd473c85007d0.
Original change needs to be reverted to align with Errata
ESR04 where "Section 8.17, General Reject Page 71" of adopted
AvDTP Spec is changed to have "Invalid Signal Identifier"
in first 6 bits of Octet 1.
This change helps passing PTS case TP/SIG/SMG/ESR04/BI-28-C
Bug:
27852645
Change-Id: Idfc960ce00662e8aacc26f3b3fdca9deca8a2aff
Navin Kochar [Fri, 18 Mar 2016 06:34:30 +0000 (12:04 +0530)]
Fix for issue introduced due to rebase of LE L2CAP COC
During
6721232 patch, some code got missed while doing manual rebase.
This patch is adding that missing code.
Bug:
27852645
Change-Id: I2525908c29e3288e0ace1ee26c5f2aa6cfd59d68
Signed-off-by: Navin Kochar <navin.kochar@intel.com>
Mudumba Ananth [Mon, 29 Feb 2016 10:21:43 +0000 (02:21 -0800)]
HFP 1.7 profile update (1/4)
-> Added AG support for HFP 1.7 version upgrade which
adds new type of indicator called HF(headset) indicators.
-> Added support for two new AT commands AT + BIND and AT + BIEV
which have been appended to Hands-Free SLC sequence.
-> Added support to propagate the above commands and their data to
the upper layers.
Bug:
19983867
Change-Id: I93d5b2af949f9fb99507a954e623cd0927ddc976
Andre Eisenbach [Wed, 1 Jun 2016 03:01:17 +0000 (03:01 +0000)]
HID: Check for EINTR in uhid_event() and fix return value evaluation
am:
32d66694e9
* commit '
32d66694e9f782a0e9dfa423015284a573f8975c':
HID: Check for EINTR in uhid_event() and fix return value evaluation
Change-Id: I0b762d88a94c33a78384e4dbd85fe1325b5e6e7d
Andre Eisenbach [Tue, 31 May 2016 21:18:36 +0000 (14:18 -0700)]
Bump HDP version to 1.1
Change-Id: I0bdec6fffa097dc919ee495216a2f272cc0dcf1e
(cherry picked from commit
bb838444c37642b7272e3ae4acaaa7a06a568cdb)
Andre Eisenbach [Mon, 30 May 2016 19:00:46 +0000 (12:00 -0700)]
HID: Check for EINTR in uhid_event() and fix return value evaluation
uhid_event() returns 0 in the normal case. Commit
3a2c2d61
results in the polling thread to be exited.
Bug:
28942565
Change-Id: Id0aff2958bc7c2704ba340aa0ff7848afb8dcf80
Pavlin Radoslavov [Fri, 27 May 2016 20:44:09 +0000 (20:44 +0000)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
am:
6834570262
* commit '
6834570262116974a176cd8598b6d0ca6d031aca':
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Change-Id: Ie47f42f72515b974a51749acda0496c8467ff636
Pavlin Radoslavov [Fri, 27 May 2016 19:07:06 +0000 (12:07 -0700)]
Update the HCI unit test if BT_CLEAN_TURN_ON_DISABLED is TRUE
Bug:
28614494
Change-Id: I3f4a923f9e14faef57b2d694bfc253fd10749414
(cherry picked from commit
7496372239773b7121359a34291681b749beda5f)
Jakub Pawlowski [Fri, 27 May 2016 04:16:15 +0000 (04:16 +0000)]
Add minimum LE connection timeout that can be used for HID devices
am:
bfc90ee868
* commit '
bfc90ee868b042aa245eed8305047b35bddfdc5c':
Add minimum LE connection timeout that can be used for HID devices
Change-Id: Ib7b42b46a48bf0d1b063fc51ba2bf9bf447f3831
Jakub Pawlowski [Thu, 26 May 2016 22:13:04 +0000 (15:13 -0700)]
Add minimum LE connection timeout that can be used for HID devices
Fixes:
28979841
Change-Id: I520608a13224601fb9101d00c08b34cdb0f8d374
Pavlin Radoslavov [Thu, 26 May 2016 03:20:41 +0000 (03:20 +0000)]
Remove the RFComm MCB from the ports when releasing it
am:
77c3905fe7
* commit '
77c3905fe7907bd10b0d24dbe469ba74f546e00e':
Remove the RFComm MCB from the ports when releasing it
Change-Id: I0a7c0a85026add0a4c892c01aea24af448e66c8c
Pavlin Radoslavov [Thu, 26 May 2016 01:08:29 +0000 (18:08 -0700)]
Remove the RFComm MCB from the ports when releasing it
Bug:
28849621
Change-Id: I3ce1c857d0d0a2c00c59d8f71b40685ae602dc29
(cherry picked from commit
1f9eb3d62c78bae8b429a48f71629d6e53f9fc87)
Jacky Cheung [Wed, 25 May 2016 23:05:57 +0000 (23:05 +0000)]
Improve config file sync during configuration save.
am:
3114ad623c
* commit '
3114ad623ca39bf6cbcee7f4841c00077faafcba':
Improve config file sync during configuration save.
Change-Id: Ia094c98c636588baf9f43e4bd186492b7c3ce25f
Jacky Cheung [Wed, 18 May 2016 22:41:09 +0000 (15:41 -0700)]
Improve config file sync during configuration save.
Add fsync() calls to force sync to disk while saving configuration
file. It is necessary to do a sync on the temp file before rename,
and to sync again on its parent directory to ensure both the
file content and the directory are up-to-date.
Bug:
27354612
Change-Id: I3a862ad59c8ae5beb8ea2c727eb5f275a2d5823e
(cherry picked from commit
95dbe03a693f4a920204b8c6acbba5269915a59f)
Ayan Ghosh [Wed, 25 May 2016 20:04:06 +0000 (20:04 +0000)]
Limit number of SBC frames to fit into single MTU
am:
8bbbee165d
* commit '
8bbbee165d2c8bb17353b11de1a3e74e089eff73':
Limit number of SBC frames to fit into single MTU
Change-Id: Iaf346a5097cd5a64ce5b8c2f4f8cc847039e0ae9
Ayan Ghosh [Mon, 11 Nov 2013 13:55:16 +0000 (19:25 +0530)]
Limit number of SBC frames to fit into single MTU
- Calculate number of SBC frames to fit into single MTU for EDR capable
remote devices. This makes sure the maximum utilization of the
available bandwidth, keeping the bitrate at high quality.
- This change helps to address the discrepancy seen with a few available
2 Mbps headsets which set the AVDTP media MTU size greater than the
2DH5 packet payload size which eventually forces AVDTP packets to get
fragmented in the controller. This change ensures packing of the SBC
frames in a way that AVDTP packet size fits within the 2DH5 payload
size.
- As packet size is restricted to meet the required bit rate more than
one AVDTP packet can be sent to the controller in a given iteration
based on the bit rate requirement.
Bug:
24875861
Change-Id: Icae7656ad563bbbdef65ecbfa15a89b26cf9edb2
Jakub Pawlowski [Tue, 24 May 2016 22:21:28 +0000 (22:21 +0000)]
Merge "Fix crashes in btif_sendmsg when worqueue not initialized" into nyc-dev
am:
d30b50a79b
* commit '
d30b50a79b0e9c2893da56a305f1c2e7803ff370':
Fix crashes in btif_sendmsg when worqueue not initialized
Change-Id: Ifd6298ef14214be603633006fa138829a66dd1e1
Ajay Panicker [Tue, 24 May 2016 22:18:30 +0000 (22:18 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5 am:
99bbe2fffe -s ours am:
34619f8e30 am:
84970d1300
am:
9a26927387
* commit '
9a26927387eb13c2310e6a2e462f567f9c24d4b7':
Add guest mode functionality (2/3)
Change-Id: I717610ba0b805313b8c5496959fea43bb2cd089d
Jakub Pawlowski [Tue, 24 May 2016 22:16:05 +0000 (22:16 +0000)]
Merge "Fix crashes in btif_sendmsg when worqueue not initialized" into nyc-dev
Ajay Panicker [Tue, 24 May 2016 22:15:52 +0000 (22:15 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5 am:
99bbe2fffe -s ours am:
34619f8e30
am:
84970d1300
* commit '
84970d13000623b266a72433474c4c2ae6abd3c6':
Add guest mode functionality (2/3)
Change-Id: I8e26f8bb0fa6898427507dfc888dfb6fd743fcac
Ajay Panicker [Tue, 24 May 2016 22:13:00 +0000 (22:13 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5 am:
99bbe2fffe -s ours
am:
34619f8e30
* commit '
34619f8e30adb98a2a605665b02df16a9fda6032':
Add guest mode functionality (2/3)
Change-Id: I00a7ad9675ba8e3f68e2066aca2fd1a5baaf06db
Ajay Panicker [Tue, 24 May 2016 22:10:22 +0000 (22:10 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev am:
4439d380e5
am:
99bbe2fffe -s ours
* commit '
99bbe2fffe98c57295a26d35b30e15c432d6a1e3':
Add guest mode functionality (2/3)
Change-Id: Ie493166a8d452f2892bb96323b23527efe053dd7
Ajay Panicker [Tue, 24 May 2016 22:02:04 +0000 (22:02 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev
am:
4439d380e5
* commit '
4439d380e5e2ec3c24b04f7eba1bcbceae78191a':
Add guest mode functionality (2/3)
Change-Id: Ia13560babbc18e2ee290e16f9b03fb5202894c23
Ajay Panicker [Tue, 24 May 2016 21:53:32 +0000 (21:53 +0000)]
Merge "Add guest mode functionality (2/3)" into mnc-dev
Jakub Pawlowski [Tue, 24 May 2016 16:15:50 +0000 (09:15 -0700)]
Fix crashes in btif_sendmsg when worqueue not initialized
Instead of crashing whole stack when trying to post task to
uninitialized queue, log error message. This can happen in two cases:
stack is not initialized yet, or we're shutting down and already cleaned
up the workqueue thread.
Bug:
28889608
Change-Id: I9b8652d27abc2489b2489997c928634b68433a3e
Jakub Pawlowski [Tue, 24 May 2016 16:11:35 +0000 (16:11 +0000)]
Don\'t disconnect on failure to register for service changed notification
am:
268d8ca547
* commit '
268d8ca5475b97de2b950bd29c7ac7b0e4427511':
Don't disconnect on failure to register for service changed notification
Change-Id: I4cd9008d4e86e3c92cceacf682ac371cd8163a12
Jakub Pawlowski [Mon, 23 May 2016 21:47:48 +0000 (14:47 -0700)]
Don't disconnect on failure to register for service changed notification
Bug:
28721625
Change-Id: I2214fb2576f0f0794922ed9b47d8805839d69bfd
TreeHugger Robot [Fri, 20 May 2016 00:02:50 +0000 (00:02 +0000)]
Merge "Add a missing OSI_NO_INTR() wrapper around socket read()" into nyc-mr1-dev
Pavlin Radoslavov [Wed, 18 May 2016 22:22:55 +0000 (15:22 -0700)]
Add a missing OSI_NO_INTR() wrapper around socket read()
Also, print a better error message.
Change-Id: I22da05fd5e9b10a5122705105ea7a45855eb144d
(cherry picked from commit
a5c0f1596095ec9017bb50c035f327f708a5d8e8)
Pavlin Radoslavov [Thu, 19 May 2016 22:49:20 +0000 (22:49 +0000)]
Merge "Improve poll(2) handling and log messages" into nyc-dev
am:
0821bffadc
* commit '
0821bffadc77a3fd0a9a191dc23ffd2c4c9c81c1':
Improve poll(2) handling and log messages
Change-Id: I22580f77fe80469b9647eeb2324675b49bf3b1ca
Pavlin Radoslavov [Thu, 19 May 2016 22:49:19 +0000 (22:49 +0000)]
Add error log messages for A2DP commands
am:
aee67ece72
* commit '
aee67ece726e9b5d0e2e02562fe013ae85c46d63':
Add error log messages for A2DP commands
Change-Id: I2d9bfd9eb440178cb58aad61b4be54910a5d52e0
TreeHugger Robot [Thu, 19 May 2016 22:39:37 +0000 (22:39 +0000)]
Merge "Improve poll(2) handling and log messages" into nyc-dev
Pavlin Radoslavov [Wed, 18 May 2016 21:34:31 +0000 (14:34 -0700)]
Improve poll(2) handling and log messages
* Better error handling and log messages inside
uipc_flush_ch_locked()
* Add missing error check inside UIPC_Read()
* Add missing OSI_NO_INTR() wrapper around poll()
inside function btu_exec_tap_fd_read()
Bug:
28823662
Change-Id: I5f1c720861bea594d53ed6465a5ff327ba352598
Pavlin Radoslavov [Wed, 18 May 2016 21:30:53 +0000 (14:30 -0700)]
Add error log messages for A2DP commands
Bug:
28823662
Change-Id: Ifa9950dd2277b444bedd5108beff2db029a5ed93
Andre Eisenbach [Wed, 18 May 2016 23:48:49 +0000 (23:48 +0000)]
Merge "Add L2CAP signaling headers and more ACL data to btsnooz" into nyc-dev
am:
6ea2168e8f
* commit '
6ea2168e8f65b43431381ea364939ec5738258e0':
Add L2CAP signaling headers and more ACL data to btsnooz
Change-Id: I3731f0ffbd1c629c19892e025ea2d4fb69c7366d
TreeHugger Robot [Wed, 18 May 2016 23:31:07 +0000 (23:31 +0000)]
Merge "Add L2CAP signaling headers and more ACL data to btsnooz" into nyc-dev
Andre Eisenbach [Tue, 17 May 2016 04:49:23 +0000 (21:49 -0700)]
Add L2CAP signaling headers and more ACL data to btsnooz
Increase the BTSNOOZ log buffer to 256kb and adds complete L2CAP
signaling headers as well as more data per ACL data packet. This will
allow additional RFCOMM debugging.
Fixes:
28845518
Change-Id: I19e1a4a40bb1c8d332a25283fb50635d791bc275
Pavlin Radoslavov [Wed, 18 May 2016 02:00:57 +0000 (02:00 +0000)]
Add a log message to capture NULL pointer in l2c_link_hci_disc_comp()
am:
fce80bb003
* commit '
fce80bb003601cf576c62d3cb9a5499790841545':
Add a log message to capture NULL pointer in l2c_link_hci_disc_comp()
Change-Id: I845d82cd2a798110ee4bb620a7a7fae53edb1ba9
Pavlin Radoslavov [Tue, 17 May 2016 00:14:03 +0000 (17:14 -0700)]
Add a log message to capture NULL pointer in l2c_link_hci_disc_comp()
Added a log message inside l2c_link_hci_disc_comp() to help capture
a NULL pointer p_lcb->p_fixed_ccbs[xx] that triggers SIGSEGV crash.
Also, updated the typedef of bdstr_t and moved it to
file "btcore/include/bdaddr.h"
Bug:
28765514
Change-Id: Iacd9376cfb9e18b58e18865581da8edad9f68821
Pavlin Radoslavov [Tue, 17 May 2016 23:53:18 +0000 (23:53 +0000)]
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR am:
f9a4d9e8bf -s ours am:
529f7e35ff -s ours
am:
559d037985 -s ours
* commit '
559d037985670d4436ba9f7314f8bd72ee944fc6':
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
Change-Id: I0cc2fba2db69aebad5f251eafce4a307fc28256d
Pavlin Radoslavov [Tue, 17 May 2016 23:46:29 +0000 (23:46 +0000)]
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR am:
f9a4d9e8bf -s ours
am:
529f7e35ff -s ours
* commit '
529f7e35ff204c641f822e318770e8240d1ae570':
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
Change-Id: I79ab95e5cd139dc99183f398bec5fe5ca2fbd38c
Pavlin Radoslavov [Tue, 17 May 2016 23:42:42 +0000 (23:42 +0000)]
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
am:
f9a4d9e8bf -s ours
* commit '
f9a4d9e8bf63b006bec9c30f6dc430ac5d30a85b':
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
Change-Id: I982345259966a2d7108a6a9699b3f71cb6d2e26f
Pavlin Radoslavov [Thu, 12 May 2016 18:36:44 +0000 (11:36 -0700)]
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
In number of places we don't handle properly system calls failures
when the errno is EINTR (i.e., the system call was interrupted
by a signal). In all our use cases, the system calls should be
restarted. The handling of the following system calls (as used in the code)
has been updated/fixed:
poll, send, recv, sendmsg, nanosleep, epoll_wait
read - mostly (e.g., socket-like fds)
write - mostly (e.g., socket-like fds)
select, accept, connect
Bug:
28471477
Bug:
28658141
Change-Id: I03e6f0f67e33876780fb6d02c33eb84547ba8f95
Pavlin Radoslavov [Tue, 17 May 2016 15:50:43 +0000 (15:50 +0000)]
Add missing arguments to log messages
am:
180b9725ee
* commit '
180b9725ee4f5d342b72d5f718762db64201e8b8':
Add missing arguments to log messages
Change-Id: I67609eccf69fc20a6fd1693eb9513675abbb6b16
Pavlin Radoslavov [Sat, 14 May 2016 04:10:22 +0000 (21:10 -0700)]
Add missing arguments to log messages
Bug:
28769522
Change-Id: I37c2b8400619646a8711099cf0bd369c3cf8eb51
Marie Janssen [Mon, 16 May 2016 18:06:42 +0000 (18:06 +0000)]
DO NOT MERGE btif: check overflow on create_pbuf size am:
ad31ee0f0f am:
d47ab963e1 am:
6f6949ff93 am:
fae8da3f76 -s ours
am:
cc5bab19bd
* commit '
cc5bab19bdd7c16b2c75418b5dc87adca4a0ef3a':
DO NOT MERGE btif: check overflow on create_pbuf size
Change-Id: I8e6bac8c79ef72e61f05e6ae9b3d5582209c083d
Marie Janssen [Mon, 16 May 2016 18:04:27 +0000 (18:04 +0000)]
DO NOT MERGE btif: check overflow on create_pbuf size am:
ad31ee0f0f am:
d47ab963e1 am:
6f6949ff93
am:
fae8da3f76 -s ours
* commit '
fae8da3f76947e30f4e65baddf8867956eb5dc45':
DO NOT MERGE btif: check overflow on create_pbuf size
Change-Id: I050ce836c311c54efab4f7e495f42901cd0a0d4e
Marie Janssen [Mon, 16 May 2016 18:02:02 +0000 (18:02 +0000)]
DO NOT MERGE btif: check overflow on create_pbuf size am:
ad31ee0f0f am:
d47ab963e1
am:
6f6949ff93
* commit '
6f6949ff93d3e370cf72b0e18673a7749bfdfa0f':
DO NOT MERGE btif: check overflow on create_pbuf size
Change-Id: I1ed5ea4b978e5f9b6628a5443a0acc3e61c297d7
Marie Janssen [Mon, 16 May 2016 17:59:28 +0000 (17:59 +0000)]
DO NOT MERGE btif: check overflow on create_pbuf size am:
ad31ee0f0f
am:
d47ab963e1
* commit '
d47ab963e1b6afd164bcfb051fe55ec47c1d211d':
DO NOT MERGE btif: check overflow on create_pbuf size
Change-Id: I839427756e92067e8c54822988648a85e537cc27
Marie Janssen [Mon, 16 May 2016 17:57:02 +0000 (17:57 +0000)]
DO NOT MERGE btif: check overflow on create_pbuf size
am:
ad31ee0f0f
* commit '
ad31ee0f0f03953064cc503314d5e39d687af50a':
DO NOT MERGE btif: check overflow on create_pbuf size
Change-Id: I77748f8ce26e15cf87f53cf3a34a11ecc19471f5
Ajay Panicker [Fri, 13 May 2016 23:04:39 +0000 (23:04 +0000)]
Add sync to write the backup file to the filesystem
am:
b7e9cb4c35
* commit '
b7e9cb4c35abbacce5313c6f1e2f5a51dc0946bb':
Add sync to write the backup file to the filesystem
Change-Id: Iec50004913bb4538ba70864f96e077e05cd84879
Ajay Panicker [Thu, 12 May 2016 22:52:01 +0000 (15:52 -0700)]
Add sync to write the backup file to the filesystem
Bug:
27354612
Change-Id: I5a7751b6f08831d43647391774501f211336e9eb
Jakub Pawlowski [Fri, 13 May 2016 21:21:01 +0000 (21:21 +0000)]
Fail gracioulsy when GATT_MAX_APPS reached
am:
ae5066bc32
* commit '
ae5066bc3293c9ca6953659fe661316c750f631d':
Fail gracioulsy when GATT_MAX_APPS reached
Change-Id: If5e561a0a0ae53fb9cb95f865e94ba97f740d014
Jakub Pawlowski [Fri, 13 May 2016 20:09:08 +0000 (13:09 -0700)]
Fail gracioulsy when GATT_MAX_APPS reached
Bug:
28677905
Change-Id: I092494ab3f9e9ae4330d5d2a6f6ef010c61fe2a4
Marie Janssen [Thu, 12 May 2016 22:30:16 +0000 (15:30 -0700)]
DO NOT MERGE btif: check overflow on create_pbuf size
Bug:
27930580
Change-Id: Ieb1f23f9a8a937b21f7c5eca92da3b0b821400e6
Ajay Panicker [Fri, 13 May 2016 19:05:19 +0000 (19:05 +0000)]
Add config logging, make parsing stricter, and move sync
am:
9eb556804a
* commit '
9eb556804ae753b6fabc66329952dae596f378b7':
Add config logging, make parsing stricter, and move sync
Change-Id: Ieeeab8079583e7389ffa2d4973fc8faab39209ef
Ajay Panicker [Thu, 12 May 2016 18:03:39 +0000 (11:03 -0700)]
Add config logging, make parsing stricter, and move sync
The functions that parse the config file will report failure if
the config file is improperly formatted or is missing the necessary
Adapter section. Also moved sync to sync the filesystem after the
config file is saved.
Bug:
27354612
Change-Id: Ia75ff628d83bdc933c4bc16761d6c55eef19b757
Eric Laurent [Fri, 13 May 2016 01:46:07 +0000 (01:46 +0000)]
audio HAL: improve control socket error handling
am:
f56308e42d
* commit '
f56308e42dc38699111b416fe68da300bf41dfbf':
audio HAL: improve control socket error handling
Change-Id: Icbb6e92a588de18b36d83600eac6ed95cef60711
Eric Laurent [Thu, 12 May 2016 01:18:54 +0000 (18:18 -0700)]
audio HAL: improve control socket error handling
Implement retry upon control socket receive error
in a2dp_ctrl_receive() if EAGAIN or EINTR.
Implement recovery from previous socket error in
a2dp_command().
Increase socket receive timeout to account for
headsets will long activation time.
Fixed state update error in start_audio_datapath()
in case the data socket is already opened.
Added missing mutex around state updated in oput_write()
and in_read()
Made read and write code symmetric.
Bug:
28727517
Change-Id: I68d7fe63f298bbd1e387ec42fdb1277b2dcdfef5
Pavlin Radoslavov [Thu, 12 May 2016 23:38:39 +0000 (23:38 +0000)]
Merge "Restart failed system calls interrupted with errno of EINTR" into nyc-dev
am:
49196d0453
* commit '
49196d04536bfd22534d1080236a983f49ef8a2e':
Restart failed system calls interrupted with errno of EINTR
Change-Id: I6bddd84a646bd44b11c12f01c3eeed3544e19f19
TreeHugger Robot [Thu, 12 May 2016 23:30:32 +0000 (23:30 +0000)]
Merge "Restart failed system calls interrupted with errno of EINTR" into nyc-dev
Marie Janssen [Thu, 12 May 2016 23:02:30 +0000 (23:02 +0000)]
btif: only save config when bonded devices change
am:
86453b65c6
* commit '
86453b65c60aec465f8e32cf515944f3f69db809':
btif: only save config when bonded devices change
Change-Id: I48be622a3016ae7167682ed2c25a50bce355a4ae
Pavlin Radoslavov [Thu, 12 May 2016 18:36:44 +0000 (11:36 -0700)]
Restart failed system calls interrupted with errno of EINTR
In number of places we don't handle properly system calls failures
when the errno is EINTR (i.e., the system call was interrupted
by a signal). In all our use cases, the system calls should be
restarted. The handling of the following system calls (as used in the code)
has been updated/fixed:
poll, send, recv, sendmsg, nanosleep, epoll_wait
read - mostly (e.g., socket-like fds)
write - mostly (e.g., socket-like fds)
select, accept, connect
Bug:
28471477
Bug:
28658141
Change-Id: I03e6f0f67e33876780fb6d02c33eb84547ba8f95
Marie Janssen [Wed, 11 May 2016 21:58:48 +0000 (14:58 -0700)]
btif: only save config when bonded devices change
Bug:
27354612
Change-Id: I15f816c85d3ab1991abf076f7c1ae2914d773d54
Jacky Cheung [Thu, 12 May 2016 18:43:20 +0000 (18:43 +0000)]
DO NOT MERGE ANYWHERE SMP: Delay authorization complete. am:
8c519caec3 -s ours am:
731684b29a -s ours
am:
42e54009d7 -s ours
* commit '
42e54009d789b5cae6df4599013852a52c1079a1':
DO NOT MERGE ANYWHERE SMP: Delay authorization complete.
Change-Id: I2317953d62203865f3830b84da6767d03156453f
Jacky Cheung [Thu, 12 May 2016 18:40:44 +0000 (18:40 +0000)]
DO NOT MERGE ANYWHERE SMP: Delay authorization complete. am:
8c519caec3 -s ours
am:
731684b29a -s ours
* commit '
731684b29a6603e3c6b22e80229d49f46c44a56c':
DO NOT MERGE ANYWHERE SMP: Delay authorization complete.
Change-Id: I01ba378fc44a2e273ef2cd53787ddc6504de38b8
Jacky Cheung [Thu, 12 May 2016 18:38:06 +0000 (18:38 +0000)]
DO NOT MERGE ANYWHERE SMP: Delay authorization complete.
am:
8c519caec3 -s ours
* commit '
8c519caec3908ce20832ce4c756f2514158da132':
DO NOT MERGE ANYWHERE SMP: Delay authorization complete.
Change-Id: I1dbfbc0b3f5cddecd18f604f5d4d0271777ce02a
Jacky Cheung [Wed, 11 May 2016 19:17:31 +0000 (12:17 -0700)]
DO NOT MERGE ANYWHERE SMP: Delay authorization complete.
Delay authorization complete during Bond Pending state in SMP.
Instead of automatically advancing the Bond Pending state, create
a 500ms window to allow the slave to stop pairing by sending over
the Pairing Failed command during the Bond Pending state.
BUG:
28475887
Change-Id: I164e8312fdf9170d0f36caf404fc42e293ed5d79
Andre Eisenbach [Wed, 11 May 2016 20:34:13 +0000 (20:34 +0000)]
Merge "Add additional VW car kits to absolute volume blacklist" into nyc-dev
am:
b65b26c699
* commit '
b65b26c699c762aca1dc4d9daac6d4c8af92b48e':
Add additional VW car kits to absolute volume blacklist
Change-Id: I6452c437bf8568c4a2086aa0cb2ff82bd5cad2d7
TreeHugger Robot [Wed, 11 May 2016 20:29:53 +0000 (20:29 +0000)]
Merge "Add additional VW car kits to absolute volume blacklist" into nyc-dev
Andre Eisenbach [Wed, 11 May 2016 19:21:41 +0000 (12:21 -0700)]
Add additional VW car kits to absolute volume blacklist
Change-Id: I8b0b73595e9183b9c1540b06e9e0378312c6a63d
Fixes:
25613423
Andre Eisenbach [Wed, 11 May 2016 19:14:05 +0000 (19:14 +0000)]
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition am:
d7ec6c9c59 -s ours am:
2e2ef67bcf -s ours
am:
8c9d6e636e -s ours
* commit '
8c9d6e636e037dc6d669891db0fa5412a6c44219':
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition
Change-Id: I5f88010068edcf2a5f0dac94950f117ffe5ebc9c
Andre Eisenbach [Wed, 11 May 2016 19:06:17 +0000 (19:06 +0000)]
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition am:
d7ec6c9c59 -s ours
am:
2e2ef67bcf -s ours
* commit '
2e2ef67bcfe9eff2e24bd336a589c17392ec9ba6':
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition
Change-Id: Ife87fe9a7bb266daddf4407d1ec5adaf4eba3e22
Andre Eisenbach [Wed, 11 May 2016 19:01:31 +0000 (19:01 +0000)]
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition
am:
d7ec6c9c59 -s ours
* commit '
d7ec6c9c59aab205a1e90fd1db3f98431e983dfd':
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition
Change-Id: Ida3953705286386634d27d00ceef540090ecc533
Andre Eisenbach [Wed, 11 May 2016 03:27:20 +0000 (20:27 -0700)]
DO NOT MERGE ANYWHERE Fix double mutex unlock and if() condition
Commit "L2CAP and SDP Search API for BT profiles (2/2)" introduced two
separate issues in btsock_rfc_signaled():
1. The "slot_lock" potentially gets unlocked twice, causing
undefined behaviour.
2. The call to BTA_JvRfcommWrite() was incorrectly taken outside
of the conditional if() block that only executes the code if
data is available.
This patch reverts the relevant locking change and fixes the if()
condition.
Bug:
27204458
Change-Id: I63b1257d21ca7bdd248858ec67e28f64e37a7895
(cherry picked from commit
2d7ddd09c163c84eacddd101cf08fd8021a35370)
Nitin Arora [Wed, 11 May 2016 18:23:09 +0000 (18:23 +0000)]
Merge changes I693b0596,Ib5a05c47,I1da213fd,I32cd6412,If62f334d, ... into nyc-dev
am:
c04eb3d3bc
* commit '
c04eb3d3bc80e056af87bc3a82037d145d99937e':
PTS: Read SMP pairing options from bt_stack.conf
PTS: Avoid BR SDP after LE pairing
PTS: Allow disabling connection updates
PTS: Add a Secure Only mode.
Changes to allow LE key upgrade
Allow C++ code to check bt_stack_config options
Change-Id: I00d0ff2c0e8393cca6a14788dd07420f0de67290
Andre Eisenbach [Wed, 11 May 2016 18:20:26 +0000 (18:20 +0000)]
Merge changes I693b0596,Ib5a05c47,I1da213fd,I32cd6412,If62f334d, ... into nyc-dev
* changes:
PTS: Read SMP pairing options from bt_stack.conf
PTS: Avoid BR SDP after LE pairing
PTS: Allow disabling connection updates
PTS: Add a Secure Only mode.
Changes to allow LE key upgrade
Allow C++ code to check bt_stack_config options
Andre Eisenbach [Wed, 11 May 2016 17:32:15 +0000 (17:32 +0000)]
Merge "Fix double mutex unlock and if() condition" into nyc-dev
am:
7de96b9846
* commit '
7de96b9846e9efabb5447ed4d7e806576fe84eeb':
Fix double mutex unlock and if() condition
Change-Id: Ic9de3b1fd342d33096e2be9559c76322dca5b362
Sharvil Nanavati [Wed, 11 May 2016 17:23:52 +0000 (17:23 +0000)]
Merge "Fix double mutex unlock and if() condition" into nyc-dev
Jakub Pawlowski [Wed, 11 May 2016 16:14:29 +0000 (16:14 +0000)]
Merge "Change initial order of commands after establishing an LE connection" into nyc-dev
am:
e91924a7d3
* commit '
e91924a7d3979605224d4718bcb34b8a19af10d9':
Change initial order of commands after establishing an LE connection
Change-Id: I487329629af4cc3314455bda89514c7c1ed686e5
Jakub Pawlowski [Wed, 11 May 2016 16:08:02 +0000 (16:08 +0000)]
Merge "Change initial order of commands after establishing an LE connection" into nyc-dev