OSDN Git Service
Jakub Pawlowski [Thu, 12 May 2016 17:28:21 +0000 (17:28 +0000)]
Rewrite multi adv set data to new style. am:
ed8aefe613
am:
33e4ad3081
* commit '
33e4ad308162a6af3bcf98bfe13c93bb2a9c69b7':
Rewrite multi adv set data to new style.
Change-Id: Ia648e95dc414f2405befb8b611c2bc53b4df3ae3
Jakub Pawlowski [Thu, 12 May 2016 17:28:21 +0000 (17:28 +0000)]
Rewrite btif_gattc_multi_adv_disable to new style am:
772fc669dc
am:
72fecda805
* commit '
72fecda8055587162b1d56116e1bf0c96f264eb8':
Rewrite btif_gattc_multi_adv_disable to new style
Change-Id: I7f5e371f6adb62ba77f5ad5576173703d8df48a9
Jakub Pawlowski [Thu, 12 May 2016 17:28:20 +0000 (17:28 +0000)]
Rewrite btif batch scan methods to new style. am:
2af2129df7
am:
aa473eb236
* commit '
aa473eb23698d617e690dccb640749369ba20d35':
Rewrite btif batch scan methods to new style.
Change-Id: Ib3798aafe5fcbca0730dfa9ae9522117fbf94ac0
Jakub Pawlowski [Thu, 12 May 2016 17:28:19 +0000 (17:28 +0000)]
Rewrite btif_get_gatt_db to new style am:
61a98132c3
am:
bfc5ee763c
* commit '
bfc5ee763c8539d1ec036fb996381f1be9a1940a':
Rewrite btif_get_gatt_db to new style
Change-Id: Id1262b05b7871af7008b710a4ef6245da54de464
Jakub Pawlowski [Thu, 12 May 2016 17:28:18 +0000 (17:28 +0000)]
Rewrite btif_gattc_set_scan_parameters to new style am:
4c634eeafc
am:
7dc964f516
* commit '
7dc964f51693fac3aee1c85ec8b45eb390d321b6':
Rewrite btif_gattc_set_scan_parameters to new style
Change-Id: I04d450daeb3c2c0459c97f53d02f842b190cb440
Jakub Pawlowski [Thu, 12 May 2016 17:28:17 +0000 (17:28 +0000)]
Rewrite GATT read operations to use new style am:
61a112e488
am:
985601906e
* commit '
985601906e9bf47cebc7d975efff9be0ab51f5f1':
Rewrite GATT read operations to use new style
Change-Id: Ic96acab3b272a9e378f0cf48e5f2deef1e8fca39
Jakub Pawlowski [Thu, 12 May 2016 17:28:16 +0000 (17:28 +0000)]
Use MessageLoop in bt_jni_workqueue thread am:
140645f6b8
am:
1d9d738f2f
* commit '
1d9d738f2f6592a81b0caf51525f47ddc540b3a3':
Use MessageLoop in bt_jni_workqueue thread
Change-Id: Ia5d9789dbb5bef63372692cf74bb1e9f0718037f
Jakub Pawlowski [Thu, 12 May 2016 17:25:51 +0000 (17:25 +0000)]
Rewrite multi adv set data to new style.
am:
ed8aefe613
* commit '
ed8aefe6134359cc70b127a23bac3a6d4c24065e':
Rewrite multi adv set data to new style.
Change-Id: Iea27f1f0c783a2f74bf487e265358fe5c97fd338
Jakub Pawlowski [Thu, 12 May 2016 17:25:50 +0000 (17:25 +0000)]
Rewrite btif_gattc_multi_adv_disable to new style
am:
772fc669dc
* commit '
772fc669dcf1221df03377e5c16507f2f7caa91b':
Rewrite btif_gattc_multi_adv_disable to new style
Change-Id: I82f7092afc59bf24e21ebccb2ecef95636741ac7
Jakub Pawlowski [Thu, 12 May 2016 17:25:49 +0000 (17:25 +0000)]
Rewrite btif batch scan methods to new style.
am:
2af2129df7
* commit '
2af2129df720baee246d4ff9a0f1a02884da856e':
Rewrite btif batch scan methods to new style.
Change-Id: I9280ad6c5b4417c0c0262ea668a04f93d1cf56e6
Jakub Pawlowski [Thu, 12 May 2016 17:25:48 +0000 (17:25 +0000)]
Rewrite btif_get_gatt_db to new style
am:
61a98132c3
* commit '
61a98132c39d3181a0ea23988ac36fbfef8194b4':
Rewrite btif_get_gatt_db to new style
Change-Id: I0431c64890aa823f679c33fe98260b3c3d2450e2
Jakub Pawlowski [Thu, 12 May 2016 17:25:47 +0000 (17:25 +0000)]
Rewrite btif_gattc_set_scan_parameters to new style
am:
4c634eeafc
* commit '
4c634eeafc79e68b40ff1ade0d96ba7b1c34f85f':
Rewrite btif_gattc_set_scan_parameters to new style
Change-Id: I51ea085022cba4ff8c9aa221d6cb523a1b6cb5bc
Jakub Pawlowski [Thu, 12 May 2016 17:25:45 +0000 (17:25 +0000)]
Rewrite GATT read operations to use new style
am:
61a112e488
* commit '
61a112e488a7686e5cc9680434c42895ef9db878':
Rewrite GATT read operations to use new style
Change-Id: I981bfd27a7010da48b204f22f7854055665497e4
Jakub Pawlowski [Thu, 12 May 2016 17:25:44 +0000 (17:25 +0000)]
Use MessageLoop in bt_jni_workqueue thread
am:
140645f6b8
* commit '
140645f6b8d87464c08f082bd14740eecab23f71':
Use MessageLoop in bt_jni_workqueue thread
Change-Id: I0d60049b62c4295bea9f2fa5f12bcbee81a5c962
Jakub Pawlowski [Tue, 3 May 2016 18:12:49 +0000 (11:12 -0700)]
Rewrite multi adv set data to new style.
Bug:
28485365
Change-Id: I28f1fd875998b039b5df969771e7b07c08d7fd3e
Jakub Pawlowski [Tue, 3 May 2016 16:11:29 +0000 (09:11 -0700)]
Rewrite btif_gattc_multi_adv_disable to new style
Bug:
28485365
Change-Id: Ifa5e4b4812ec236cc9a41a2129eaa43c328fa28f
Jakub Pawlowski [Tue, 3 May 2016 16:03:11 +0000 (09:03 -0700)]
Rewrite btif batch scan methods to new style.
Bug:
28485365
Change-Id: I62dfa6911ca0e26d490a9702d391aa30a09829a9
Jakub Pawlowski [Tue, 3 May 2016 15:55:11 +0000 (08:55 -0700)]
Rewrite btif_get_gatt_db to new style
Bug:
28485365
Change-Id: Iec63e595bfb82a4ac33564f3095cf0e7c4c37e39
Jakub Pawlowski [Tue, 3 May 2016 01:12:11 +0000 (18:12 -0700)]
Rewrite btif_gattc_set_scan_parameters to new style
Bug:
28485365
Change-Id: I29cb2e11b3e407676e312fe83248fc8b551e60ad
Jakub Pawlowski [Tue, 3 May 2016 00:50:25 +0000 (17:50 -0700)]
Rewrite GATT read operations to use new style
Bug:
28485365
Change-Id: I3c5918abdf79da7d6b566506ad53fa38656bcb65
Jakub Pawlowski [Sat, 30 Apr 2016 21:37:40 +0000 (14:37 -0700)]
Use MessageLoop in bt_jni_workqueue thread
Up till now, to execute anyting on bt_jni_workqueue thread, we were
sending events to workqueue associated with this thread. Flow was:
btif_transfer_context -> btif_sendmsg -> thread_post.
Events were containing defined action, i.e. BTIF_GATTC_SCAN_START and
pointer to struct that contained all required data to execute it.
This was very cumbersome - figuring out what is executed when event is
send was hard. Also everything have to be packed into structure which
means that
we have to define lots of structures, or have one big super-structure
holding data for all events (like in btif_gatt_client.cc). Event sending
and receiving
logic is a huge percent of all code.
From now on, there will be a MessageLoop running inside bt_jni_workqueue
that will execute all tasks that will be posted with PostTask. The
benefit of having PostTask method, is that we can simply create Closure
that will be run in bt_jni_workqueue thread. It will take care of
transferring all associated values, and their cleanup. It will also do
compile-time check of all parameters. We no longer have to create
events, structs, and separate call logic from execution logic.
Bug:
28485365
Change-Id: I5014ef680757c0d3c6c69781aadc5139c8e1c3c4
Andre Eisenbach [Wed, 11 May 2016 20:39:13 +0000 (20:39 +0000)]
Add additional VW car kits to absolute volume blacklist am:
29e7944184
am:
e68974630b
* commit '
e68974630bc5f88b2d110a6157ba9c7964736026':
Add additional VW car kits to absolute volume blacklist
Change-Id: I9fa51d668eb0ffd8f52db6a79cc1593f09bb21f5
Andre Eisenbach [Wed, 11 May 2016 20:34:13 +0000 (20:34 +0000)]
Add additional VW car kits to absolute volume blacklist
am:
29e7944184
* commit '
29e794418452c8b35c2d42fe0cda81acd86bbf43':
Add additional VW car kits to absolute volume blacklist
Change-Id: If5c53e050f667e1042748809d04c48d5c7bb108d
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: I52be95fde5460763a322dcfbb5657c77ca47a7f2
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:20:23 +0000 (12:20 -0700)]
Add additional VW car kits to absolute volume blacklist
Change-Id: I8b0b73595e9183b9c1540b06e9e0378312c6a63d
Fixes:
25613423
Andre Eisenbach [Wed, 11 May 2016 19:14:34 +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: Ia147b21ef389344a1fbc799bec09222f39e32030
Nitin Arora [Wed, 11 May 2016 19:14:31 +0000 (19:14 +0000)]
Merge changes I693b0596,Ib5a05c47,I1da213fd,I32cd6412,If62f334d, ... into nyc-dev
am:
c04eb3d3bc -s ours
* 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: Iafddfd4d05da9a33edaf52d3bdbf21f50b7b710a
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)
Andre Eisenbach [Wed, 11 May 2016 18:36:39 +0000 (18:36 +0000)]
Fix double mutex unlock and if() condition am:
0403dcd262
am:
3f90226b45
* commit '
3f90226b451a55df8eacc58a80aec14cd88b1503':
Fix double mutex unlock and if() condition
Change-Id: Iaded560e3011c19ca4610d102ac2df6ab0a5f4e4
Andre Eisenbach [Wed, 11 May 2016 18:34:08 +0000 (18:34 +0000)]
Fix double mutex unlock and if() condition
am:
0403dcd262
* commit '
0403dcd262980110ef2a24ac9c0a72d0dc3d96bb':
Fix double mutex unlock and if() condition
Change-Id: Ib81d74eb8940060149509bcae7c8f289b3bf0f9c
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
Bryce Lee [Wed, 11 May 2016 18:25:47 +0000 (18:25 +0000)]
Move extern "C" to top of headers and remove tBTA_HF_CLIENT_HDR. am:
3d6accfcc0
am:
42f3fda2f3
* commit '
42f3fda2f3b638c64d936dd2997a926b0e0b1c71':
Move extern "C" to top of headers and remove tBTA_HF_CLIENT_HDR.
Change-Id: Ic858d35c8cfb4d9241c06e843d48aefc14963907
Bryce Lee [Wed, 11 May 2016 18:23:10 +0000 (18:23 +0000)]
Move extern "C" to top of headers and remove tBTA_HF_CLIENT_HDR.
am:
3d6accfcc0
* commit '
3d6accfcc0bdc5c7a8713320c9bb069cbf253348':
Move extern "C" to top of headers and remove tBTA_HF_CLIENT_HDR.
Change-Id: I0850e31cd573afb2ef6d625cbe8c6ae78ab3a000
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
Bryce Lee [Wed, 11 May 2016 00:10:09 +0000 (17:10 -0700)]
Move extern "C" to top of headers and remove tBTA_HF_CLIENT_HDR.
Previously, extern "C" was placed in various locations within the header
files, sometimes below actual struct declarations. Doing so would lead to
alignment issues between C and C++ code.
tBTA_HF_CLIENT_HDR was removed from bta_hf_client_api since it was
extraneous and empty - leading to alignment issues.
Change-Id: Icdd338f1affe4c3a70c7bbd716249be6a16443d2
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: I119771005b03c736888d586f872dec490b788017
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:45:22 +0000 (16:45 +0000)]
Change initial order of commands after establishing an LE connection am:
9376f77974
am:
b280ffa123
* commit '
b280ffa123defda6f1d284d815b6114324608996':
Change initial order of commands after establishing an LE connection
Change-Id: I79f31859b17d46a2e19973aaade00ecc99819930
Jakub Pawlowski [Wed, 11 May 2016 16:45:22 +0000 (16:45 +0000)]
Change initial order of commands after establishing an LE connection am:
272c9711bc
am:
55adc02665
* commit '
55adc02665bdaf8f2a5cb5fd44033d7bae3b8e79':
Change initial order of commands after establishing an LE connection
Change-Id: If344934cf1e3403da55c0455627ac1133532e74d
Jakub Pawlowski [Wed, 11 May 2016 16:42:16 +0000 (16:42 +0000)]
Change initial order of commands after establishing an LE connection
am:
9376f77974
* commit '
9376f7797412447a7a00aabafafc53f06232405f':
Change initial order of commands after establishing an LE connection
Change-Id: I3cbf6a6f338085f6cf71ebbd757f24af17e51357
Jakub Pawlowski [Wed, 11 May 2016 16:42:14 +0000 (16:42 +0000)]
Change initial order of commands after establishing an LE connection
am:
272c9711bc
* commit '
272c9711bc6363f0b32c48a86d71726bdd9abfd9':
Change initial order of commands after establishing an LE connection
Change-Id: Ia1d2d01da3f34efeefe17f61d7f82cb4d32f6cb3
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 [Wed, 11 May 2016 16:20:11 +0000 (16:20 +0000)]
Merge "Change initial order of commands after establishing an LE connection" into nyc-dev
am:
e91924a7d3 -s ours
* commit '
e91924a7d3979605224d4718bcb34b8a19af10d9':
Change initial order of commands after establishing an LE connection
Change-Id: I46a5d064ff0036f40d005ef361848eec142c6bee
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:36 +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: Icef1676f2bb9b2f9b7eac8b8a2fe3a21b5e86737
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:21 +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: I7a20a5bbc50f156e61aab86bc2c898d1fe28522d
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
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
AnubhavGupta [Tue, 10 May 2016 19:28:17 +0000 (19:28 +0000)]
A2DP_SINK: create avrcp connection only if a2dp is successful am:
71461b979a
am:
85ddaee6db
* commit '
85ddaee6db63b678cfc5f991f2c9c61d7e0be977':
A2DP_SINK: create avrcp connection only if a2dp is successful
Change-Id: Iae94218af6a7b59215d5cb10b8597b1a1bf3298f
AnubhavGupta [Tue, 10 May 2016 19:25:42 +0000 (19:25 +0000)]
A2DP_SINK: create avrcp connection only if a2dp is successful
am:
71461b979a
* commit '
71461b979a25adc0c30eae899837575e1d95490d':
A2DP_SINK: create avrcp connection only if a2dp is successful
Change-Id: I66a2e42b6b491266eb6dd21d73b7409f0eade41d
AnubhavGupta [Thu, 7 Apr 2016 17:35:53 +0000 (23:05 +0530)]
A2DP_SINK: create avrcp connection only if a2dp is successful
Scenario: Pair and connect carkit to a remote mobile
Disconnect from carkit
Initiate connection from carkit and turn BT-OFF
on remote mobile phone
Issuses: Even though A2DP connection is unsuccessful we
try to connect AVRCP connectoin
Solution:
- for a2dp sink, we should not send pending play command
- we should create avrcp connection only if a2dp connection
is successful
Change-Id: If2c6a3710b6ebdaa382a3d8bcae5c137aaef1f2c
Lianchao Song [Tue, 10 May 2016 15:42:19 +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: I009b29d128f27cf3c4b42e0d6bc57cbfb258cd04
Alain Vongsouvanh [Tue, 10 May 2016 15:42:19 +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: Ia69ee1bb0f5ad2db16ba1977e1f5017bdfdf14fc
Zhao Xuewen [Tue, 10 May 2016 15:42:17 +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: I6acd40c301687ae2dd703fc35005baa5f93477aa
Marie Janssen [Tue, 10 May 2016 15:42:16 +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: I1a326f2f1b0a4eedcd737a27fe1a3b0cf68f904e
Sharvil Nanavati [Tue, 10 May 2016 15:42:14 +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: Ib31a366b5b4afc4c296a5e9dfc757c6f477d872d
Sharvil Nanavati [Tue, 10 May 2016 15:42:12 +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: Ia5cddd9e0262c98375f40af8304b6166b48a1543
Jacky Cheung [Tue, 10 May 2016 15:40:22 +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: I0172c278ab7105ef53ec056e56bd876ba32bf097
Andre Eisenbach [Tue, 10 May 2016 15:40:21 +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: Ib77058733802e4103a48901502dd3582b813fd9d
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: I5c5bf3549cf10cf08579a0003fff90c67c87ed03
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: I423ad00c917bcbb502891670d17f2ef80423732e
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: I1edb92eb273f25a7615bd749516eda88e9564d42
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: I6063928a3e80a1fe15c5bbfd1613bb09943561d0
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: Ic19e2c8a807a7b4122fd26b0a18d99c044bf5b9e
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: Iab19b3a13b537252f6b8e6de6eaeaf0a321d8102
Jacky Cheung [Tue, 10 May 2016 15:40:13 +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: I6626a382e3a7d84ec085eba76048c29ab53305f7
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: I279a85b021e048a1224c5e27c68c7733116e9f2b
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: Iecb32534a22dc3589b8281ca68c232e25ebca11c
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: I9ee263f33ee80545439185012dfa348c587f9843
Sharvil Nanavati [Tue, 10 May 2016 15:40:05 +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: I216326ea183b3a7b41e62bc108a432d9eef45cf6
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: I2c1ef1aaed53edb83236cbd07f8848884d59280b
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: I3faa2b1f2da7ca9a7c0736254114511fdd5ce6ec
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