OSDN Git Service
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)
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
Nitin Arora [Sat, 12 Mar 2016 00:37:51 +0000 (16:37 -0800)]
PTS: Read SMP pairing options from bt_stack.conf
Use Case:
A number of cenrtification test cases require the host
to change the pairing options including auth request,
I/O capabilities, key distribution mask, key length
and Out of band capability.
Test Case: TP/PKE/BV-02-C
Failure:
Host currently only supports fixed SMP options and only
a few test cases involving pairing, are executed due
to that limitation.
Fix:
Added changes to read the SMP options from the bt_stack.conf
file at run time.
The pairing options are entered as a comma separated list eg:
SMPOptions=0xD,0x4,0xf,0xf,0x10
where the included hex values are in the following order:
\#auth, io, ikey, rkey, ksize
If all 5 options are not present, the host falls back to the
default values
Bug:
27852645
Change-Id: I693b05966695cf4660c5da10249c5f7c0663e53a
Nitin Arora [Fri, 11 Mar 2016 02:27:24 +0000 (18:27 -0800)]
PTS: Avoid BR SDP after LE pairing
Use Case: Certification test case requiring LE secure pairing
with PTS.
Test Case: TP/SCJW/BV-01-C
Failure:
While pairing with PTS for certification test cases, LE secure
pairing followed by BR/EDR cross key derivation results in the
host initiating the SDP to gather the remote BR/EDR services.
PTS considers it as a test failure.
Fix: Added run time flag in bt_stack.conf file
"PTS_DisableSDPOnLEPair" to disable the SDP immidiately after
LE pairing followed by cross key derivation.
Bug:
27852645
Change-Id: Ib5a05c47b99c2ef8256967a608ae9ebbdfba60ee
Nitin Arora [Thu, 11 Jun 2015 00:10:57 +0000 (17:10 -0700)]
PTS: Allow disabling connection updates
Use Case: Certification test case requiring LE secure pairing
with PTS.
Failure:
LE pairing test cases follow the host behavior where
connection parameters are switched to fast parameters
for SMP and service discovery and switched back to the
default values after SMP/LE discovery is complete.
PTS disconnects to these series of connection updates.
Fix:
This change disables connection updates based on run time
flag "PTS_DisableConnUpdates" fetched from bt_stack.conf
Bug:
27852645
Change-Id: I1da213fd143ccfcb0ac82c7049a94094d2716ff1
Nitin Arora [Fri, 11 Mar 2016 20:26:51 +0000 (12:26 -0800)]
PTS: Add a Secure Only mode.
Use Case:
Certification test cases require BLE to be in secure only
mode and reject legacy pairing requests.
Test Case: TP/SEC/SEM/BV-28-C
Failure:
Currently the host doesn't have a method of putting host into
a mode where it can only perform secure pairing.
This prevents execution of certification test cases
requiring Secure Only mode.
Fix:
Made changes to read the value of a tag "PTS_SecurePairOnly"
at runtime from the file "bt_stack.conf".
Bug:
27852645
Change-Id: I32cd6412621efeed2cb31c760a031762d9f369f9
Nitin Arora [Tue, 30 Jun 2015 22:04:23 +0000 (15:04 -0700)]
Changes to allow LE key upgrade
Use Case: Certifiation test cases require the LE key upgrade
to happen when the current MITM level of the device has
been upgraded. In that case, a repairing is performed,
leading to more authenticated LTK.
Test Case: TP/SEC/AUT/BV-17-C
Steps:
1. Perform LE pairing between two devices using no MITM.
2. Change the IO capability of the devices, so that a
repair would involve authentication.
3. Reconnect the devices and expect key upgrade.
Failure:
No key upgrade is seen at reconnection and the devices
continue to use the old key.
Fix:
Added changes to re-calulate the requirement of key
upgrade when the LE channel is already encrypted.
Bug:
27852645
Change-Id: If62f334dcf298b2ce9840e95035b4398cb951c84
Myles Watson [Thu, 5 May 2016 18:57:54 +0000 (11:57 -0700)]
Allow C++ code to check bt_stack_config options
Stack configuration options are parsed in C.
Bug:
28485365
Change-Id: I046ef5c676256a8da23bf8c0a7d1eeb1e9603c05
Marie Janssen [Wed, 11 May 2016 03:58:37 +0000 (03:58 +0000)]
resolve merge conflicts of
d266361 to mnc-dr1.5-dev am:
922654c09e -s ours
am:
c292927af5
* commit '
c292927af51a979bc3c4a15abb6d6599a236bc97':
btif: Don't persist remote devices to the config
Change-Id: I862c9734084a25b2eba8b32c0e03b7d7ab76fdc8
Marie Janssen [Wed, 11 May 2016 03:56:04 +0000 (03:56 +0000)]
resolve merge conflicts of
d266361 to mnc-dr1.5-dev
am:
922654c09e -s ours
* commit '
922654c09e4c114e74090e481a4777a2c393731d':
btif: Don't persist remote devices to the config
Change-Id: Id2e7cc528b34841b092d298a0d13d3bd4f3358cc
Andre Eisenbach [Wed, 11 May 2016 03:27:20 +0000 (20:27 -0700)]
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
Jakub Pawlowski [Tue, 10 May 2016 23:43:41 +0000 (16:43 -0700)]
Change initial order of commands after establishing an LE connection
This patch changes order of commands send to LE device after connecting.
This will cause update connection parameters to be send after read
remote version. Having it other way around cause some problems with
broadcom chips, even though it should work both ways.
Bug:
28435172
Change-Id: I8ecf76217b036842e1d9ec7df714da94a99df7d5
Jakub Pawlowski [Tue, 10 May 2016 20:49:23 +0000 (20:49 +0000)]
Merge "Change initial order of commands after establishing an LE connection" into nyc-dev
am:
754c7a7b28
* commit '
754c7a7b28a13d74991a1ec9fde22af27d90d9db':
Change initial order of commands after establishing an LE connection
Change-Id: I2afa11939446a84e3309485079102c0c153d3d40
Jakub Pawlowski [Tue, 10 May 2016 20:44:49 +0000 (20:44 +0000)]
Merge "Change initial order of commands after establishing an LE connection" into nyc-dev
Jakub Pawlowski [Tue, 10 May 2016 20:29:59 +0000 (13:29 -0700)]
Change initial order of commands after establishing an LE connection
This patch changes order of commands send to LE device after connecting.
This will cause update connection parameters to be send after read
remote features. Having it other way around cause some problems with
broadcom chips, even though it should work both ways.
Bug:
28435172
Change-Id: I280993d40b63d41729f5a8ccf246809c3abf617d
Lianchao Song [Tue, 10 May 2016 15:42:14 +0000 (15:42 +0000)]
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found am:
5130f53 -s ours am:
6ded1cbed4 -s ours
am:
dd9e2bfa49 -s ours
* commit '
dd9e2bfa4987e22f4eb90049c983040f72ed38ae':
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found
Change-Id: Ieab486307d2ee3c4def445d8dca1d3de44da03d4
Alain Vongsouvanh [Tue, 10 May 2016 15:42:14 +0000 (15:42 +0000)]
Merge "DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml" into cw-e-dev am:
debb9bf -s ours am:
8fd9b7f82e -s ours
am:
00fa193132 -s ours
* commit '
00fa193132a82468cfb8689751ab1b6cdf410345':
DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml
Change-Id: Idd43c5c349142ce0a6e9194b359b5efc40b40837
Zhao Xuewen [Tue, 10 May 2016 15:42:12 +0000 (15:42 +0000)]
DO NOT MERGE ANYWHERE Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect. am:
7cd14dc -s ours am:
78d9f31d73 -s ours
am:
ab78b06e86 -s ours
* commit '
ab78b06e86cef69c45cc89d4075d80197eedc4ee':
DO NOT MERGE ANYWHERE Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect.
Change-Id: I2c862fac9c90f7738d60a9c7debf7a0130c3eaa0
Marie Janssen [Tue, 10 May 2016 15:42:11 +0000 (15:42 +0000)]
DO NOT MERGE Check size of pin before replying am:
f0a69c3 am:
d016a5e am:
0c841c8 am:
9d8e2f6a49 -s ours
am:
6247e0b28f
* commit '
6247e0b28f668d141e7b009265f386f3e0e4ebe3':
DO NOT MERGE Check size of pin before replying
Change-Id: I1cd5fb4d4a3dd558b1407a12c8978220987bb378
Sharvil Nanavati [Tue, 10 May 2016 15:42:09 +0000 (15:42 +0000)]
Merge "DO NOT MERGE ANYWHERE Don\'t clear the btsnoop log ringbuffer on compress." into cw-e-dev am:
32e0b11 -s ours am:
9a9a088761 -s ours
am:
0356f46f18 -s ours
* commit '
0356f46f18c8e31b9d475914fcf91daae5a6bee1':
DO NOT MERGE ANYWHERE Don't clear the btsnoop log ringbuffer on compress.
Change-Id: I89f9b0bdba5088df40d8b7766ce2ad9372e2d8dc
Sharvil Nanavati [Tue, 10 May 2016 15:42:08 +0000 (15:42 +0000)]
DO NOT MERGE ANYWHERE Don\'t send BT+BCC if local device doesn\'t support codec negotiation. am:
ef192019f8 -s ours am:
4498648ede -s ours
am:
365a0d402a -s ours
* commit '
365a0d402a1602eaa9a2f0a15d7b425d0432a804':
DO NOT MERGE ANYWHERE Don't send BT+BCC if local device doesn't support codec negotiation.
Change-Id: Iae6365a4f2283aa8fd93adb8df919b46348a92ba
Jacky Cheung [Tue, 10 May 2016 15:40:21 +0000 (15:40 +0000)]
Merge "DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM." into cw-e-dev am:
ce1b1a6ac4 -s ours am:
c28ef1474c -s ours
am:
2b460c41e1 -s ours
* commit '
2b460c41e1e890db72bb3b80b4f80618fe684d86':
DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM.
Change-Id: I005f335e0dec144a0a2eeda91192fdde48d03795
Andre Eisenbach [Tue, 10 May 2016 15:40:20 +0000 (15:40 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control am:
8fe9b6c9f7 am:
ef43e49660 -s ours am:
95a2c10363 -s ours
am:
4c2d25d1a1
* commit '
4c2d25d1a132f8391b5268fe3bcd40096736b7a6':
DO NOT MERGE Blacklist devices for absolute volume control
Change-Id: I43a964adafd98663b322e51899820fbffcd7c5a9
Sharvil Nanavati [Tue, 10 May 2016 15:40:20 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file. am:
b51ad9de6a -s ours am:
fbe8c67b7d -s ours
am:
10be3e51ac -s ours
* commit '
10be3e51ac037cd167d7a28f0883dde64c3a7406':
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file.
Change-Id: Idb4cff745ee30aeff8c8f921a6494e1220fae603
Ajay Panicker [Tue, 10 May 2016 15:40:19 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Create backup for bt_config.conf am:
4d5f21452e -s ours am:
033c59192c -s ours
am:
7e52eeede7 -s ours
* commit '
7e52eeede7d171053047b802ad4404178643b30e':
DO NOT MERGE ANYWHERE Create backup for bt_config.conf
Change-Id: I26c9245cd78967306ea2ff41eeec3ca7d5cc9d6d
Andre Eisenbach [Tue, 10 May 2016 15:40:18 +0000 (15:40 +0000)]
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev am:
bd48fd98ad am:
9c32e564df am:
1c3f2f19e6 -s ours
am:
a72dc32ec8
* commit '
a72dc32ec8381be813857d7b8f40dd1cecd857ca':
DO NOT MERGE Add ability to add interop entries dynamically (2/2)
Change-Id: I811c3e0281e19685b5b7cf364a141aee083c8f3f
Andre Eisenbach [Tue, 10 May 2016 15:40:17 +0000 (15:40 +0000)]
DO NOT MERGE Remove Porsche car-kit pairing workaround am:
ed01581886 am:
0befe2bd60 am:
f87612c768 am:
67cbb3f146 -s ours
am:
03525d90d0
* commit '
03525d90d07308474c9e67514e02924128234ee7':
DO NOT MERGE Remove Porsche car-kit pairing workaround
Change-Id: I2f3e43f7ba258a72a5b1d062a7a13356019217ef
Jacky Cheung [Tue, 10 May 2016 15:40:16 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout. am:
3bdb1d48d0 -s ours am:
9784748d28 -s ours
am:
1fc58f22b5 -s ours
* commit '
1fc58f22b591cfcc5f1ced99184dfade9f3c822a':
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout.
Change-Id: Iba6e1edfa14f8ce5190f9ca291937820e00c0161
Sharvil Nanavati [Tue, 10 May 2016 15:40:14 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag. am:
8dc3dfc2e7 -s ours am:
1e93a64272 -s ours
am:
42a6b5f5a2 -s ours
* commit '
42a6b5f5a222a03dc3cec12e6691c4ef429f2e6e':
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.
Change-Id: Ib6d6c437fb27a61b6d0a0fee16e3036bf5f7aa85
Jacky Cheung [Tue, 10 May 2016 15:40:12 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts. am:
5a362a2f14 -s ours am:
3ecd1121d1 -s ours
am:
6e7a5f00d0 -s ours
* commit '
6e7a5f00d045155709525032851d6aef42f822c0':
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts.
Change-Id: I54e59614abd243b562f6d9b1fa335dd90ff8637b
Sharvil Nanavati [Tue, 10 May 2016 15:40:11 +0000 (15:40 +0000)]
Merge "Assume input from /dev/stdin if no argument provided to btsnooz.py." into cw-e-dev am:
853ca86427 -s ours am:
a3ed438701
am:
db4e9beabd
* commit '
db4e9beabd694f5ba78c5108579d42a975653611':
Assume input from /dev/stdin if no argument provided to btsnooz.py.
Change-Id: I9eea4295c123d2ed6ba8f35ef45577e45a9b13b5
Victor Tasayco Loarte [Tue, 10 May 2016 15:40:09 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init am:
ef1f356866 -s ours am:
86ccba4678 -s ours
am:
4e9764fdf4 -s ours
* commit '
4e9764fdf4630a218d153c2ccda539bca01a625f':
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init
Change-Id: I3d7bce5bc58351b98e4026d08d33eed892855f52
Sharvil Nanavati [Tue, 10 May 2016 15:40:07 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don\'t get a reply from the audio gateway. am:
529a69c8e8 -s ours am:
9073d039b1 -s ours
am:
ea0dc3c653 -s ours
* commit '
ea0dc3c6539ae83876926e938b4f3d65df16d204':
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don't get a reply from the audio gateway.
Change-Id: I3249341dd9ae59a26f5b31ae5165ff3291edc8f3
Sharvil Nanavati [Tue, 10 May 2016 15:40:04 +0000 (15:40 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear." into cw-e-dev am:
f1f9523db0 -s ours am:
87912b8170 -s ours
am:
10d34bedf6 -s ours
* commit '
10d34bedf663856b48931da58e7ff5a131d7af39':
DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear.
Change-Id: I660c2dfb85accfc43a38c29efee78c301d4ed33b
Sharvil Nanavati [Tue, 10 May 2016 15:40:02 +0000 (15:40 +0000)]
Merge "DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL." into cw-e-dev am:
e3aabcbbf5 -s ours am:
9844f6c5dd -s ours
am:
7dbccaa5c7 -s ours
* commit '
7dbccaa5c789aeb5d92d0109f0bd78387846273a':
DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL.
Change-Id: I3ba1d0e7bed0fa3911595857d29d9e440e97b7cb
Andre Eisenbach [Tue, 10 May 2016 15:40:00 +0000 (15:40 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev am:
8c0745ad21 -s ours
am:
b5e366d111
* commit '
b5e366d111beef15fd13455286c40aae7f105ab0':
Additional headsets blacklisted for absolute volume
Change-Id: Icc3fe2e3fdf726a8cc5d861cfa18e2d35f718bb4
Lianchao Song [Tue, 10 May 2016 15:38:56 +0000 (15:38 +0000)]
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found am:
5130f53 -s ours
am:
6ded1cbed4 -s ours
* commit '
6ded1cbed4df0d4552103b1df190651dea55d7c8':
DO NOT MERGE ANYWHERE Do not update sco_state when no matching peer_addr is found
Change-Id: I6bcc41f6a5e8470f8ff514350d4043b3e4a08620
Alain Vongsouvanh [Tue, 10 May 2016 15:38:55 +0000 (15:38 +0000)]
Merge "DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml" into cw-e-dev am:
debb9bf -s ours
am:
8fd9b7f82e -s ours
* commit '
8fd9b7f82e5907d0e5d491a0191c88ebd49cba9d':
DO NOT MERGE ANYWHERE Bring back support for legacy bt_config.xml
Change-Id: I21ffcd61c64c4e7d915b9aff721477dec85e9ebe
Zhao Xuewen [Tue, 10 May 2016 15:38:54 +0000 (15:38 +0000)]
DO NOT MERGE ANYWHERE Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect. am:
7cd14dc -s ours
am:
78d9f31d73 -s ours
* commit '
78d9f31d73caeeab3b1cc7645082d9ca9a8eff53':
DO NOT MERGE ANYWHERE Bluetooth: Fix the issue that peer A2DP SNK device can not auto-reconnect.
Change-Id: Ie91872eb8022f827230e7c39a75f497f4ba758c1
Marie Janssen [Tue, 10 May 2016 15:38:54 +0000 (15:38 +0000)]
DO NOT MERGE Check size of pin before replying am:
f0a69c3 am:
d016a5e am:
0c841c8
am:
9d8e2f6a49 -s ours
* commit '
9d8e2f6a498b966db73f45c5098e8dd13133d0d6':
DO NOT MERGE Check size of pin before replying
Change-Id: I87d3d4a73e309a0e4989c2cf53e9f78c54b0e6e6
Sharvil Nanavati [Tue, 10 May 2016 15:38:53 +0000 (15:38 +0000)]
Merge "DO NOT MERGE ANYWHERE Don\'t clear the btsnoop log ringbuffer on compress." into cw-e-dev am:
32e0b11 -s ours
am:
9a9a088761 -s ours
* commit '
9a9a08876151ca871ea15f2bde1f3d6d688e67f5':
DO NOT MERGE ANYWHERE Don't clear the btsnoop log ringbuffer on compress.
Change-Id: I4e11dc5ea337ac178a494d565512ebdcc9691caf
Sharvil Nanavati [Tue, 10 May 2016 15:37:39 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Don\'t send BT+BCC if local device doesn\'t support codec negotiation. am:
ef192019f8 -s ours
am:
4498648ede -s ours
* commit '
4498648ede31cea4858322620587c8da7ea0d1ac':
DO NOT MERGE ANYWHERE Don't send BT+BCC if local device doesn't support codec negotiation.
Change-Id: I78985b37be61d5fe21179021e3372534290ae6b9
Jacky Cheung [Tue, 10 May 2016 15:37:39 +0000 (15:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM." into cw-e-dev am:
ce1b1a6ac4 -s ours
am:
c28ef1474c -s ours
* commit '
c28ef1474c240fb38aa1ec177d3ad174b33f2828':
DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM.
Change-Id: I03070dbd437422fdb788cba1e09e0fd417259210
Andre Eisenbach [Tue, 10 May 2016 15:37:38 +0000 (15:37 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control am:
8fe9b6c9f7 am:
ef43e49660 -s ours
am:
95a2c10363 -s ours
* commit '
95a2c10363cb93d1572cfb32df990f2fcf2163d6':
DO NOT MERGE Blacklist devices for absolute volume control
Change-Id: Ifa7be865da2a007843520781fea59d43a0bc77d7
Sharvil Nanavati [Tue, 10 May 2016 15:37:38 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file. am:
b51ad9de6a -s ours
am:
fbe8c67b7d -s ours
* commit '
fbe8c67b7d576433edfdc73422b2360281dd49e8':
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file.
Change-Id: Iaa96e0146923ebd79b2a00854e33467c4d857657
Ajay Panicker [Tue, 10 May 2016 15:37:37 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Create backup for bt_config.conf am:
4d5f21452e -s ours
am:
033c59192c -s ours
* commit '
033c59192c6ab35daacb0da35819ffeb92f30ae9':
DO NOT MERGE ANYWHERE Create backup for bt_config.conf
Change-Id: I48a7bdbc3808eb8edfbba66662606820bb1d8e7c
Andre Eisenbach [Tue, 10 May 2016 15:37:36 +0000 (15:37 +0000)]
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev am:
bd48fd98ad am:
9c32e564df
am:
1c3f2f19e6 -s ours
* commit '
1c3f2f19e616ea34978521d5eafaf1f387b2acef':
DO NOT MERGE Add ability to add interop entries dynamically (2/2)
Change-Id: Ie85400020a1c270f9629363a437a264730a27a84
Andre Eisenbach [Tue, 10 May 2016 15:37:36 +0000 (15:37 +0000)]
DO NOT MERGE Remove Porsche car-kit pairing workaround am:
ed01581886 am:
0befe2bd60 am:
f87612c768
am:
67cbb3f146 -s ours
* commit '
67cbb3f1468aa29ba1a605cf8540a8ed2f0ede8b':
DO NOT MERGE Remove Porsche car-kit pairing workaround
Change-Id: If6ad12cadb4a4869b439fb2fcb5e88df32d00111
Jacky Cheung [Tue, 10 May 2016 15:37:35 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout. am:
3bdb1d48d0 -s ours
am:
9784748d28 -s ours
* commit '
9784748d287e66e8442d642794d2a181ba79031d':
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout.
Change-Id: I86410cc4cd914ba8620d29af063b90545d89a88b
Sharvil Nanavati [Tue, 10 May 2016 15:37:34 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag. am:
8dc3dfc2e7 -s ours
am:
1e93a64272 -s ours
* commit '
1e93a642725a5411af0bc0bbf95b6712ef05fbed':
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.
Change-Id: I4ac25f2d4014d8e14aa5a2872add31f075d2cdde
Jacky Cheung [Tue, 10 May 2016 15:37:33 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts. am:
5a362a2f14 -s ours
am:
3ecd1121d1 -s ours
* commit '
3ecd1121d131141070b7395bb849af29d01c18db':
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts.
Change-Id: I9f6f5c11dc0cb14b383c644bf56db63e8b2877b6
Sharvil Nanavati [Tue, 10 May 2016 15:37:32 +0000 (15:37 +0000)]
Merge "Assume input from /dev/stdin if no argument provided to btsnooz.py." into cw-e-dev am:
853ca86427 -s ours
am:
a3ed438701
* commit '
a3ed4387016bb116659bba081fc1636b8c732e7b':
Assume input from /dev/stdin if no argument provided to btsnooz.py.
Change-Id: Ic33b785f042a9d3176f6d5a2873245372f651996
Victor Tasayco Loarte [Tue, 10 May 2016 15:37:31 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init am:
ef1f356866 -s ours
am:
86ccba4678 -s ours
* commit '
86ccba46786e7caa5a20fbc926f0328d4019e7a2':
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init
Change-Id: Ie45199e22bec6920bcd012f9d07c6d5d43a25197
Sharvil Nanavati [Tue, 10 May 2016 15:37:30 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don\'t get a reply from the audio gateway. am:
529a69c8e8 -s ours
am:
9073d039b1 -s ours
* commit '
9073d039b1ac633231e0ab8a2c707bfc5beb3c6c':
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don't get a reply from the audio gateway.
Change-Id: Id80d31bce15408cd7e5d7ec85973e260ce4da4aa