OSDN Git Service
Jakub Pawlowski [Tue, 28 Feb 2017 02:00:53 +0000 (02:00 +0000)]
btsnd_hcic_ble_rand refactor
am:
0c683232e2
Change-Id: I0a36f6335b98128b53fe3f9a2c89e7b442a8954f
Jakub Pawlowski [Fri, 24 Feb 2017 17:49:59 +0000 (09:49 -0800)]
btsnd_hcic_ble_rand refactor
Make btsnd_hcic_ble_rand accept base::Callback instead of function
pointer. This will result in great code simplifications in further
patches.
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I9933caa78b20d0011ce3e17fd72d5740bcc4ae6d
Myles Watson [Sat, 25 Feb 2017 02:28:16 +0000 (02:28 +0000)]
test_vendor: Replace __FUNCTION__ with __func__
am:
8cd930cc9d
Change-Id: I5608b7565b3ddb0679f5865016daa876855e63a7
Myles Watson [Tue, 13 Dec 2016 17:47:55 +0000 (09:47 -0800)]
test_vendor: Replace __FUNCTION__ with __func__
Test: Bluetooth settings still works
Change-Id: I4de24cceb9beb262ce7f96e7291288b70618f694
Ajay Panicker [Fri, 24 Feb 2017 19:24:43 +0000 (19:24 +0000)]
Revert "HID: Fix scroll issue with Apple Magic Mouse"
am:
f11e42b1c2
Change-Id: I1697dbe5da844376f11ec4003f84e9fb50d67cb4
Ajay Panicker [Fri, 24 Feb 2017 17:37:30 +0000 (17:37 +0000)]
Revert "HID: Fix scroll issue with Apple Magic Mouse"
Reverting due to the fact that this causes many HID issues with fugu.
The general problem seems to be that this patch requires kernel 3.18
while fugu is currently on 3.10. Will investigate further later but
reverting for now to fix fugu.
This reverts commit
3e2201163b609aab6dcc0778158e790c3201353b.
Fixes:
35667962
Fixes:
35712367
Change-Id: I536da368fc9796b26dc52892eda6501772683330
Pavlin Radoslavov [Fri, 24 Feb 2017 02:50:42 +0000 (02:50 +0000)]
Merge "Set the AAC audioMuxVersion to "2""
am:
ee975e8740
Change-Id: I96db4dee5da91a602e00d362530865239c2bc909
Treehugger Robot [Fri, 24 Feb 2017 02:48:23 +0000 (02:48 +0000)]
Merge "Set the AAC audioMuxVersion to "2""
Pavlin Radoslavov [Fri, 24 Feb 2017 01:04:40 +0000 (01:04 +0000)]
Merge "Update the AAC bitrate settings"
am:
13f4c4d474
Change-Id: I2bea4a4bb701f2e6cbc4791446d78801482b442f
Treehugger Robot [Fri, 24 Feb 2017 01:01:15 +0000 (01:01 +0000)]
Merge "Update the AAC bitrate settings"
Jakub Pawlowski [Fri, 24 Feb 2017 00:55:08 +0000 (00:55 +0000)]
Display passkey when bonding
am:
197a1b99e5
Change-Id: If3756ba5ac9bee99116e8845806826aaa3e80076
Jakub Pawlowski [Thu, 23 Feb 2017 22:43:08 +0000 (14:43 -0800)]
Display passkey when bonding
Test: manual
Change-Id: I238dfadf401b90d52caa4c381ea068b48091c092
Jakub Pawlowski [Fri, 24 Feb 2017 00:17:33 +0000 (00:17 +0000)]
Merge "Clear state mask when scan stopped"
am:
6f77461775
Change-Id: I628ce848b48928f2da2b04befbaaf7d8b021d35b
Treehugger Robot [Fri, 24 Feb 2017 00:14:26 +0000 (00:14 +0000)]
Merge "Clear state mask when scan stopped"
Pavlin Radoslavov [Thu, 23 Feb 2017 21:57:15 +0000 (13:57 -0800)]
Set the AAC audioMuxVersion to "2"
This change is needed, because there are Sink devices that
expect a fixed latmBufferFullness value.
Bug:
35715579
Test: A2DP streaming to various devices
Change-Id: Ia27490920cda273cee15bfd7e643b85a5c5e428d
Pavlin Radoslavov [Thu, 23 Feb 2017 21:49:54 +0000 (13:49 -0800)]
Update the AAC bitrate settings
Use AACENC_PEAK_BITRATE to limit the maximum bitrate as limited by
the MTU, and use AACENC_BITRATE to set the encoder bitrate.
Previously, both were set to the same value. That was disabling
the AAC bitreservoir, and eventually affecting the audio quality.
Bug:
35715570
Test: A2DP streaming to various devices
Change-Id: I6adac4889f9b2d7509182df8961ddfada02ee8ac
Bluetooth Build Test [Thu, 23 Feb 2017 22:53:56 +0000 (22:53 +0000)]
Don't build vendor lib on Linux
am:
3eadf272be
Change-Id: I1eb9b9e320de0f624a585fc7668969cc8a56ffd8
Bluetooth Build Test [Wed, 22 Feb 2017 19:52:30 +0000 (11:52 -0800)]
Don't build vendor lib on Linux
The stack does no longer use vendor libs. We use hci_layer_linux.cc now.
Test: manual
Change-Id: I6c64337280c073647faf0bd775d75c5d700e7911
Jakub Pawlowski [Thu, 23 Feb 2017 21:55:02 +0000 (13:55 -0800)]
Clear state mask when scan stopped
Test: manual test
Change-Id: Icc47679aaba92afd7f3eab48416065d3a741a745
Jakub Pawlowski [Thu, 23 Feb 2017 19:39:14 +0000 (19:39 +0000)]
Log which advertising HCI interface is used
am:
9bb5a64390
Change-Id: I25376b92d1d4b51c5c99823a62660b181a34d2a1
Jakub Pawlowski [Thu, 23 Feb 2017 17:50:31 +0000 (09:50 -0800)]
Log which advertising HCI interface is used
This is useful for debugging advertising issues.
Test: manual
Change-Id: Ia51eccb1ff7922a5864572a89e77404299965862
Pavlin Radoslavov [Thu, 23 Feb 2017 18:30:38 +0000 (18:30 +0000)]
Merge "Close leftover Audio-to-Bluetooth HAL connections before reopening"
am:
06a384fde6
Change-Id: I6924175127d046ffd77d3215c32089ea69df158f
Treehugger Robot [Thu, 23 Feb 2017 18:26:03 +0000 (18:26 +0000)]
Merge "Close leftover Audio-to-Bluetooth HAL connections before reopening"
Jakub Pawlowski [Thu, 23 Feb 2017 17:31:05 +0000 (17:31 +0000)]
Fix stack shutdown on Linux
am:
8342d95fa5
Change-Id: I11181cab2c052a9a011348ca2820b8e88de484a6
Jakub Pawlowski [Thu, 23 Feb 2017 01:14:29 +0000 (17:14 -0800)]
Fix stack shutdown on Linux
Right now, hci_close() is getting stuck on stopping the reader thread.
In order to fix that, we must have a way to exit the blocking read when
shutting down the stack.
Test: manual
Change-Id: I3a7eeef6d8ed223fc96ba9eeacca37006a5c9739
Pavlin Radoslavov [Thu, 23 Feb 2017 06:07:17 +0000 (22:07 -0800)]
Close leftover Audio-to-Bluetooth HAL connections before reopening
If the Audio-to-Bluetooth HAL reopens a connection on the Data or
Control channel without closing first the old one, the UIPC select(2)
loop gets confused and could spin with 100% CPU usage.
Now we check for channels that are reopened, and explicitly close
them before reopening.
Also, fix a check whether a file descriptor is valid: 0 is a valid
file descriptor.
Test: A2DP testing with a headset: connect/play/stop
Bug:
35394629
Change-Id: I7ae988ac77f25da56e59e347363e7c473e7f69a9
Myles Watson [Thu, 23 Feb 2017 12:04:48 +0000 (12:04 +0000)]
Merge "test_vendor: Return success for no-ops"
am:
e770da5966
Change-Id: Idab0d0c1f0eb716eb954ecc02f0a100c24c28048
Treehugger Robot [Thu, 23 Feb 2017 12:01:32 +0000 (12:01 +0000)]
Merge "test_vendor: Return success for no-ops"
Jakub Pawlowski [Wed, 22 Feb 2017 23:30:04 +0000 (23:30 +0000)]
HCI for Linux
am:
9329b8effa
Change-Id: Ifd7919db1c605a5fe2ba9603b8ca5536b67a1474
Jakub Pawlowski [Wed, 22 Feb 2017 23:29:54 +0000 (23:29 +0000)]
Move Android specific HCI code into separate file
am:
32fbec6a86
Change-Id: I2483d6849534efd3c752a360c9939ecad8b7fb59
Jakub Pawlowski [Tue, 21 Feb 2017 22:55:21 +0000 (14:55 -0800)]
HCI for Linux
Test: manual
Change-Id: I7183c4773ae409f63296bd3c53a02ec2a460f021
Jakub Pawlowski [Tue, 21 Feb 2017 21:28:10 +0000 (13:28 -0800)]
Move Android specific HCI code into separate file
Test: manual
Change-Id: I0a99e528acaa1adec39425b7bf6f8d8b5c024632
Jakub Pawlowski [Wed, 22 Feb 2017 21:00:48 +0000 (21:00 +0000)]
Fix stack crash after bonding
am:
71a58bdcf0
Change-Id: Ic4cb6957bc082185e8d340e65b2519b9a670edcf
Jakub Pawlowski [Wed, 22 Feb 2017 18:34:45 +0000 (10:34 -0800)]
Fix stack crash after bonding
delayed_auth_timer_ent was freed and re-created during it's execution.
Instead of re-creating, just cancel the timers in smp_cb_cleanup.
Test: manual, bond with HID device on linux
Bug:
34083285
Change-Id: Ie569666846db5dcb2466cff00665b2c1490d7d10
Chih-Hung Hsieh [Tue, 21 Feb 2017 23:47:04 +0000 (23:47 +0000)]
Use email address in OWNERS files.
am:
bd93e0a919
Change-Id: Ib1c255b055be24761537b5d64a373bd71027b53a
Chih-Hung Hsieh [Tue, 21 Feb 2017 21:48:52 +0000 (13:48 -0800)]
Use email address in OWNERS files.
Bug:
33166666
Test: default build targets
Change-Id: Id2b579215291cb1f6ae03ebc167f07bd59713dc4
Jakub Pawlowski [Tue, 21 Feb 2017 19:54:50 +0000 (19:54 +0000)]
Linux build fix
am:
a386df9ac1
Change-Id: I20be84e3405cb884370868b438a3b3eb2b0f353b
Jakub Pawlowski [Mon, 20 Feb 2017 19:15:32 +0000 (20:15 +0100)]
Linux build fix
Test: build on linux
Change-Id: I21d613fb3e914949d3e8e8fcdae60e620e685394
Jakub Pawlowski [Tue, 21 Feb 2017 19:22:31 +0000 (19:22 +0000)]
Compile audio codec libraries on linux
am:
eff4dd5208
Change-Id: Id36b22b07f122dbb5986970ade585e4b57eb596e
Jakub Pawlowski [Mon, 20 Feb 2017 19:18:51 +0000 (20:18 +0100)]
Compile audio codec libraries on linux
Test: build on linux
Change-Id: I72c7621fde1f229e3dd2a8cfa0cf0339e601914c
Jakub Pawlowski [Tue, 21 Feb 2017 18:07:00 +0000 (18:07 +0000)]
Merge changes from topic 'ble_scanner_callbacks'
am:
a77f83eddd
Change-Id: Ic65c3398a5e74488983f2025246d890763a813c0
Jakub Pawlowski [Tue, 21 Feb 2017 18:06:57 +0000 (18:06 +0000)]
Remove unnecessary extern declarations
am:
96ad0d2596
Change-Id: I1a7224223a1a0b7c5a0de2764f34058bd6feb586
Jakub Pawlowski [Tue, 21 Feb 2017 18:03:40 +0000 (18:03 +0000)]
Merge changes from topic 'ble_scanner_callbacks'
* changes:
Use base::Callbacks in BleScannerInterface (2/3)
Remove unnecessary extern declarations
Myles Watson [Tue, 21 Feb 2017 17:47:43 +0000 (17:47 +0000)]
Merge "Clean up some more #defines"
am:
f4fb7e1443
Change-Id: I523553f266bea5d78b3ff799ca1d68e7efa59bfc
Treehugger Robot [Tue, 21 Feb 2017 16:09:14 +0000 (16:09 +0000)]
Merge "Clean up some more #defines"
Pulkit Bhuwalka [Sat, 18 Feb 2017 03:36:35 +0000 (03:36 +0000)]
Fix SIGBUS error in BT stack when pairing with ARM boards
am:
5a6b32562a
Change-Id: I0fb8fdf6a8983c92115297ee3fb5f2f7ec27e701
Jakub Pawlowski [Thu, 16 Feb 2017 19:56:56 +0000 (11:56 -0800)]
Use base::Callbacks in BleScannerInterface (2/3)
The remaining four native callbacks need more internal refactoring
before they can be turned into a callbacks.
Bug:
30622771
Test: sl4a FilteringTest
Change-Id: I8e1532bdfa2b0f22545f095eb427fd5ac1a75b56
Jakub Pawlowski [Fri, 17 Feb 2017 22:20:40 +0000 (14:20 -0800)]
Remove unnecessary extern declarations
Test: manual
Change-Id: I21bdb5952fff359a9ee7091d740ecac13aad640a
Pulkit Bhuwalka [Sat, 18 Feb 2017 00:25:22 +0000 (16:25 -0800)]
Fix SIGBUS error in BT stack when pairing with ARM boards
This CL fixes the actual crash location on pairing within the code.
https://android-review.googlesource.com/#/c/338167/ fixed the macro.
Bug:
35154933
Test: Verified by building and pairing with RPI3/NXP Arm boards.
Change-Id: Ic35f446e53aa724ecab72801b7f89c70fd11ba62
Myles Watson [Fri, 17 Feb 2017 18:49:59 +0000 (10:49 -0800)]
test_vendor: Return success for no-ops
Bug:
35408667
Test: Marlin with debug library BT starts and stops
Change-Id: Idd95115c17ca2fed983526ea47a44799e7de6e0c
Jakub Pawlowski [Fri, 17 Feb 2017 23:02:53 +0000 (23:02 +0000)]
Thread switching simplification
am:
0482c8a3f4
Change-Id: Id72cd958f51558c98b28fb466e7a0b87e549756a
Jakub Pawlowski [Fri, 17 Feb 2017 20:18:59 +0000 (12:18 -0800)]
Thread switching simplification
* add jni_thread_wrapper
* add FROM_HERE parameter to do_in_jni_thread, this will be used in
later patches to make thread switching logs nice.
Bug:
30622771
Test: manual
Change-Id: I4c8f9e0f32c501a6126fe04f2476ab6453fe637e
Myles Watson [Fri, 17 Feb 2017 19:23:41 +0000 (19:23 +0000)]
Check the return value of the HAL init function am:
3e50ee8817
am:
98a62eb84f
Change-Id: I3c21277c55156dce98003f7edb17e3264962703e
Myles Watson [Fri, 17 Feb 2017 19:18:40 +0000 (19:18 +0000)]
Check the return value of the HAL init function
am:
3e50ee8817
Change-Id: I1b5b7db6d3b626cf7fe70f8aa98f76060cda1fff
Myles Watson [Fri, 17 Feb 2017 16:30:18 +0000 (08:30 -0800)]
Check the return value of the HAL init function
If the HAL can be opened, but initialization fails, Bluetooth
can not start.
Test: Force an initialization failure, BT dies
Change-Id: I7dd5ed49c9e7873a666dc001e68bdc13660648ba
Myles Watson [Thu, 9 Feb 2017 17:38:07 +0000 (09:38 -0800)]
Clean up some more #defines
true -> TRUE
false -> FALSE
Test: builds
Change-Id: I2573b6ab81aa384cc6d20bb8beb84303aba06a66
Andre Eisenbach [Fri, 17 Feb 2017 03:04:34 +0000 (03:04 +0000)]
Fix HDP select thread id type am:
f28952970e am:
6c1929f588
am:
6bacd28c3e
Change-Id: Ibce71a56f288ec44c802d22f5e2063758065dc41
Andre Eisenbach [Fri, 17 Feb 2017 03:00:05 +0000 (03:00 +0000)]
Fix HDP select thread id type am:
f28952970e
am:
6c1929f588
Change-Id: Id4473f3db0f99789ad700101545aae349ae13a8a
Andre Eisenbach [Fri, 17 Feb 2017 02:55:04 +0000 (02:55 +0000)]
Fix HDP select thread id type
am:
f28952970e
Change-Id: I3171422ec9bfd8a0937ef500c9fc85b0af70b4e1
Andre Eisenbach [Fri, 17 Feb 2017 02:38:25 +0000 (18:38 -0800)]
Fix HDP select thread id type
Recent changes in libbionic cause pthread_join to SIGABRT if called with
an invalid thread id. The select_thread_id variable in the HDP
sub-system was truncated from long->int causing pthread_join to not find
the correct thread and triggering the error.
Using the correct type for select_thread_id fixes this problem.
Change-Id: Id332fa86cf7f30abd211588d32899d41e157b462
Fixes:
35432169
Test: manual; boot device, turn BT off; ensure it stays off
Pavlin Radoslavov [Thu, 16 Feb 2017 22:30:17 +0000 (22:30 +0000)]
Merge "Add a mutex to guard all btsnoop operations" am:
d8a0667363 am:
0c5b10be09
am:
267b056e34
Change-Id: I8ffcb7166ba8df99b2109ff4499737a3bc314dbf
Pavlin Radoslavov [Thu, 16 Feb 2017 22:26:18 +0000 (22:26 +0000)]
Merge "Add a mutex to guard all btsnoop operations" am:
d8a0667363
am:
0c5b10be09
Change-Id: Ie42a94583e0d65170b0b1a7477b1d05927ffb1aa
Pavlin Radoslavov [Thu, 16 Feb 2017 22:21:46 +0000 (22:21 +0000)]
Merge "Add a mutex to guard all btsnoop operations"
am:
d8a0667363
Change-Id: I1ba7c525e9cd24fd5d5d588b0b950e1cc39a785f
Treehugger Robot [Thu, 16 Feb 2017 22:14:23 +0000 (22:14 +0000)]
Merge "Add a mutex to guard all btsnoop operations"
Jakub Pawlowski [Thu, 16 Feb 2017 20:23:18 +0000 (20:23 +0000)]
Merge changes Idcbbc7eb,I3dc48800 am:
6f04f03f44 am:
9f0ff40820
am:
dc6dc99c58
Change-Id: I9e272358825f4fe24b5c4480a5588f12a20ba992
Jakub Pawlowski [Thu, 16 Feb 2017 20:23:06 +0000 (20:23 +0000)]
Fix advertise data parsing am:
2e97666062 am:
aacdc55171
am:
43a4986e41
Change-Id: Ib24e031ef6f4573286e8ccb16153ae5f002b8d16
Jakub Pawlowski [Thu, 16 Feb 2017 20:19:25 +0000 (20:19 +0000)]
Merge changes Idcbbc7eb,I3dc48800 am:
6f04f03f44
am:
9f0ff40820
Change-Id: Ie63d140ad279fe66f71515242bb65f4d43d0c279
Jakub Pawlowski [Thu, 16 Feb 2017 20:19:11 +0000 (20:19 +0000)]
Fix advertise data parsing am:
2e97666062
am:
aacdc55171
Change-Id: I7ed5f1725a722062042e296d9e93e0e9a7a807a9
Jakub Pawlowski [Thu, 16 Feb 2017 20:15:22 +0000 (20:15 +0000)]
Merge changes Idcbbc7eb,I3dc48800
am:
6f04f03f44
Change-Id: I690e029727e74f6c948ff29be79f2c90645d5a9c
Jakub Pawlowski [Thu, 16 Feb 2017 20:15:05 +0000 (20:15 +0000)]
Fix advertise data parsing
am:
2e97666062
Change-Id: Ia196299b560036813eaf4b2268e5d1dd720943ce
Jakub Pawlowski [Thu, 16 Feb 2017 20:09:52 +0000 (20:09 +0000)]
Merge changes Idcbbc7eb,I3dc48800
* changes:
Use LE Extended Create Connection when possible
Add LE Extended Create Connection HCI command
Pavlin Radoslavov [Thu, 16 Feb 2017 19:51:48 +0000 (11:51 -0800)]
Add a mutex to guard all btsnoop operations
After switching to HIDL, capture() can be called by multiple threads.
Capturing a packet and writing to the btsnoop/btsnooz logs
require multiple operations, hence we need a mutex to make those
operations atomic.
Previously, there were occasional btsnoop_hci.log files
with corrupted data as reported by Wireshark.
Test: Manual - captured multiple btsnoops_hci.log files.
Change-Id: Ib89d9156ad7e27a7dee652f71a0cf38c85d4447c
Jakub Pawlowski [Thu, 16 Feb 2017 15:12:22 +0000 (07:12 -0800)]
Use LE Extended Create Connection when possible
Bug:
30622771
Test: manual
Change-Id: Idcbbc7eb6f9b32b2f258d6f8913ead6986510da8
Jakub Pawlowski [Wed, 15 Feb 2017 16:35:30 +0000 (08:35 -0800)]
Add LE Extended Create Connection HCI command
Bug:
30622771
Test: manual
Change-Id: I3dc48800bd2dfb2f00c824c89888c9f4e8271497
Jakub Pawlowski [Thu, 16 Feb 2017 17:23:48 +0000 (09:23 -0800)]
Fix advertise data parsing
This patch fixes overflow of position variable, and possible read
outside of vector boundaries when parsing advertise data.
Parsing 1004 bytes of hex "
112233112233.." was causing infinite loop.
Bug:
30622771
Test: manual
Change-Id: I0d669f7958de73f5d53350fb293ff27fea172f44
Hemant Gupta [Thu, 16 Feb 2017 15:41:46 +0000 (15:41 +0000)]
HID: Fix scroll issue with Apple Magic Mouse am:
3e2201163b am:
266f1f8335
am:
92f0f82f2b
Change-Id: I4bdcc1b588742990fc9c81d12e2e5251c93858ea
Hemant Gupta [Thu, 16 Feb 2017 15:37:48 +0000 (15:37 +0000)]
HID: Fix scroll issue with Apple Magic Mouse am:
3e2201163b
am:
266f1f8335
Change-Id: Ifc1101137398845aa86b46ce3f06348016071a66
Hemant Gupta [Thu, 16 Feb 2017 15:33:48 +0000 (15:33 +0000)]
HID: Fix scroll issue with Apple Magic Mouse
am:
3e2201163b
Change-Id: I368798f4084b3cd4126c76707a9dfc6e9b8ea3d1
Hemant Gupta [Tue, 25 Oct 2016 19:17:57 +0000 (12:17 -0700)]
HID: Fix scroll issue with Apple Magic Mouse
Usecase
1) Pair and connect with Apple Magic Mouse
2) Scroll over HID mouse and see if pointer moves up or down
on DUT.
Observation:
Scroll functionality does not work on DUT and mouse pointer
stays still.
Root Cause:
From kernel 3.18 onwards, UHID flags are updated and following new
flags are added. Support for handling same is missing in user
space hid driver (bta_hh_co.cc)
UHID_GET_REPORT
UHID_GET_REPORT_REPLY
UHID_SET_REPORT
UHID_SET_REPORT_REPLY
Fix:
Add support for set report and get report in HID user
space because of changes in uhid kernel driver with kernel changes
for kernel 3.18. Apple Magic Mouse scroll functionality does not
work without this fix, as Apple Mouse requires set report from
HID host for it to start working properly wrt Scroll functionality.
Bug:
35306202
Change-Id: I90230b76d68e9275dcacd9f46f03e312ddf2fa30
Pavlin Radoslavov [Wed, 15 Feb 2017 04:02:28 +0000 (04:02 +0000)]
Add a missing NULL pointer check inside bta_av_rcfg_str_ok() am:
c9cff56fea am:
22b8ffcda5
am:
d2e6bb3414
Change-Id: I36455903a2faa96eb19281c436fa228846c4d72b
Pavlin Radoslavov [Wed, 15 Feb 2017 03:59:28 +0000 (03:59 +0000)]
Add a missing NULL pointer check inside bta_av_rcfg_str_ok() am:
c9cff56fea
am:
22b8ffcda5
Change-Id: I996c38aba138ef98929b887ff2e2f3e42e943c2f
Pavlin Radoslavov [Wed, 15 Feb 2017 03:56:57 +0000 (03:56 +0000)]
Add a missing NULL pointer check inside bta_av_rcfg_str_ok()
am:
c9cff56fea
Change-Id: I9346b420fe29960640871ae380d0ddb51973523f
Pulkit Bhuwalka [Wed, 15 Feb 2017 01:51:18 +0000 (01:51 +0000)]
Merge "Fix SIGBUS error in BT stack when pairing with ARM boards" am:
24dc553b55 am:
dea0ee893c
am:
a50ddefb17
Change-Id: Id1f77223f3da7554735d35117a204b2f864b3c43
Pulkit Bhuwalka [Wed, 15 Feb 2017 01:48:18 +0000 (01:48 +0000)]
Merge "Fix SIGBUS error in BT stack when pairing with ARM boards" am:
24dc553b55
am:
dea0ee893c
Change-Id: Idf9adfc5b7cb1b92c246b4ef88b2f85bb4fcc3cc
Pulkit Bhuwalka [Wed, 15 Feb 2017 01:46:18 +0000 (01:46 +0000)]
Merge "Fix SIGBUS error in BT stack when pairing with ARM boards"
am:
24dc553b55
Change-Id: I286d317aa89c363ba1f3baecd4c707211b9411f6
Pavlin Radoslavov [Wed, 15 Feb 2017 01:38:19 +0000 (17:38 -0800)]
Add a missing NULL pointer check inside bta_av_rcfg_str_ok()
Apparently, the p_data argument could be NULL if the reconfig
was triggered by the local device.
Test: Tested with Bluetooth headsets
Bug:
35351216
Change-Id: Ic51d849232944b5978772d222c41f66824e14dd4
Treehugger Robot [Wed, 15 Feb 2017 01:39:00 +0000 (01:39 +0000)]
Merge "Fix SIGBUS error in BT stack when pairing with ARM boards"
Pavlin Radoslavov [Tue, 14 Feb 2017 23:38:07 +0000 (23:38 +0000)]
Update the A2DP MTU if the L2CAP MTU changes during codec reconfiguration am:
31d373be95 am:
d964b1ac31
am:
f83a01bd43
Change-Id: I07218532c30dd7d8e6be9fc1898dff64581b088f
Pavlin Radoslavov [Tue, 14 Feb 2017 23:36:08 +0000 (23:36 +0000)]
Update the A2DP MTU if the L2CAP MTU changes during codec reconfiguration am:
31d373be95
am:
d964b1ac31
Change-Id: I9f2104a48467d0c8d54322a8bbb67f080c4d61be
Pavlin Radoslavov [Tue, 14 Feb 2017 23:34:08 +0000 (23:34 +0000)]
Update the A2DP MTU if the L2CAP MTU changes during codec reconfiguration
am:
31d373be95
Change-Id: I5c897b42abbcf6d14c5c9f74e8e186d3eaff259d
Pulkit Bhuwalka [Tue, 14 Feb 2017 01:44:47 +0000 (17:44 -0800)]
Fix SIGBUS error in BT stack when pairing with ARM boards
Bluetooth stack crashes with a SIGBUS memory unaligned error since the
toolchain optimizes memcpy to generate register instructions which are
unaligned in memory. Similar issue was seen earlier in
https://android-review.googlesource.com/#/c/181713/
which was solved by casting pointers to (void *). That fix misses edge
cases where the destination pointer needs to be casted as well.
Change-Id: I23cc16142deaf3dc1fff91588d736abdfcb3bfde
Fixes:
35154933
Test: Verified by building and pairing with RPI3/NXP Arm boards.
Pavlin Radoslavov [Tue, 14 Feb 2017 20:18:44 +0000 (12:18 -0800)]
Update the A2DP MTU if the L2CAP MTU changes during codec reconfiguration
Previously, the MTU was saved inside the AVDTP module after the first
codec setup. However, the MTU wasn't updated after codec reconfiguration.
As a result, if a Sink device uses different (smaller) MTU for
a codec like SBC, then switching fron another codec to SBC will
result in generating SBC frames that are too large to transmit,
and there will be no audio.
Bug: b/
35351216
Test: A2DP streaming and codec switch to various Sink devices.
Change-Id: Ieb3caf4ef7a30a7af31ceb2f6132807739829441
Qasim Javed [Tue, 14 Feb 2017 02:37:16 +0000 (02:37 +0000)]
Merge "Lower the BLE connection supervision timeout to 5s." am:
72caf0257f am:
9056c8cf9d
am:
aad5c7cdb7
Change-Id: Ib9e2f3ea4d1d06e72d2f92c6eaa34c9bcb38c9b1
Qasim Javed [Tue, 14 Feb 2017 02:35:45 +0000 (02:35 +0000)]
Merge "Lower the BLE connection supervision timeout to 5s." am:
72caf0257f
am:
9056c8cf9d
Change-Id: I6f21dbda3394261573516f2684fef67c5a3d215d
Qasim Javed [Tue, 14 Feb 2017 02:33:44 +0000 (02:33 +0000)]
Merge "Lower the BLE connection supervision timeout to 5s."
am:
72caf0257f
Change-Id: I565c7920cef98cfdaa59e0585734e71587dee579
Treehugger Robot [Tue, 14 Feb 2017 02:26:15 +0000 (02:26 +0000)]
Merge "Lower the BLE connection supervision timeout to 5s."
Jakub Pawlowski [Tue, 14 Feb 2017 01:50:45 +0000 (01:50 +0000)]
Merge "Change LE advertisement data length type (uint8_t -> uint16_t)" am:
f49eebd089 am:
13a35c0898
am:
08043caecb
Change-Id: I57ff4fffcf02b708da96e07071c02a1d300d86cb
Jakub Pawlowski [Tue, 14 Feb 2017 01:44:47 +0000 (01:44 +0000)]
Merge "Change LE advertisement data length type (uint8_t -> uint16_t)" am:
f49eebd089
am:
13a35c0898
Change-Id: If48478b23df412a809178d83a82a0050258ffe4d
Jakub Pawlowski [Tue, 14 Feb 2017 01:38:29 +0000 (01:38 +0000)]
Merge "Change LE advertisement data length type (uint8_t -> uint16_t)"
am:
f49eebd089
Change-Id: Iecf2d0e338ec4d30aebbe8c385925076ab630a3c
Jakub Pawlowski [Tue, 14 Feb 2017 01:34:29 +0000 (01:34 +0000)]
Merge "Change LE advertisement data length type (uint8_t -> uint16_t)"
OSDN Git Service
