OSDN Git Service

android-x86/system-bt.git
7 years agoMerge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL"
Marie Janssen [Thu, 13 Oct 2016 00:27:13 +0000 (00:27 +0000)]
Merge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL"
am: 14b3339e71

Change-Id: Id0d90c7ff59b86b9b685a635ef894c835c2ca1f9

7 years agoMerge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL"
Treehugger Robot [Thu, 13 Oct 2016 00:22:49 +0000 (00:22 +0000)]
Merge "cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL"

7 years agoFix file permissions for source code files
Pavlin Radoslavov [Wed, 12 Oct 2016 22:50:07 +0000 (22:50 +0000)]
Fix file permissions for source code files
am: fdd641e512

Change-Id: I80c163e8bfc2ba6f087b60dcc8833bd373289f35

7 years agoFix file permissions for source code files
Pavlin Radoslavov [Wed, 12 Oct 2016 19:54:05 +0000 (12:54 -0700)]
Fix file permissions for source code files

Removed file execute permissions for:
 - bta/include/bta_hh_co.h
 - embdrv/sbc/decoder/Android.mk
 - embdrv/sbc/Android.mk
 - embdrv/Android.mk
 - btif/co/bta_ag_co.cc

Test: visual inspection of file permissions
Change-Id: I746debb1e8ceaa1cc14f867641b25cb42c04c7be

7 years agocleanup: Remove BT_USE_TRACES and BT_TRACE_APPL
Marie Janssen [Wed, 12 Oct 2016 19:40:57 +0000 (12:40 -0700)]
cleanup: Remove BT_USE_TRACES and BT_TRACE_APPL

Test: mma in system/bt

Change-Id: I357eb44a97f3935262252cf97c13cef078a95e4d

7 years agoMerge "btif: migrate from pthread locks to std::mutex"
Marie Janssen [Wed, 12 Oct 2016 16:24:43 +0000 (16:24 +0000)]
Merge "btif: migrate from pthread locks to std::mutex"
am: 84ada302fe

Change-Id: Ifab7477d07b3f49aa2469bdc6f0fae68f2f948f7

7 years agoMerge "btif: migrate from pthread locks to std::mutex"
Marie Janssen [Wed, 12 Oct 2016 16:17:42 +0000 (16:17 +0000)]
Merge "btif: migrate from pthread locks to std::mutex"

7 years agoMoved the typedef of period_ms_t from alarm.h to time.h
Pavlin Radoslavov [Wed, 12 Oct 2016 02:36:55 +0000 (02:36 +0000)]
Moved the typedef of period_ms_t from alarm.h to time.h
am: d92fc91abb

Change-Id: Ied9b5b09295972e29b67ba605098ad1e51c742fb

7 years agoMoved the typedef of period_ms_t from alarm.h to time.h
Pavlin Radoslavov [Wed, 12 Oct 2016 00:46:45 +0000 (17:46 -0700)]
Moved the typedef of period_ms_t from alarm.h to time.h

Test: code compilation
Change-Id: Ib61126d7921d088b045dca6c5b69a5379603fcc3

7 years agobtif: migrate from pthread locks to std::mutex
Marie Janssen [Mon, 10 Oct 2016 20:38:30 +0000 (13:38 -0700)]
btif: migrate from pthread locks to std::mutex

Test: run unit tests / sanity connection to devices
Change-Id: I293c3600affd229fea67cdd6624eba7f186cbcb7

7 years agoManually merge commit 'cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix automerger
Stephen Li [Tue, 11 Oct 2016 17:35:51 +0000 (17:35 +0000)]
Manually merge commit 'cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix automerger
am: 9ad78d6513

Change-Id: Ie67f15b078eeb20862cafce05ecca598bcbad6ab

7 years agostack: remove dead (#if 0'd) code
Marie Janssen [Tue, 11 Oct 2016 17:35:41 +0000 (17:35 +0000)]
stack: remove dead (#if 0'd) code
am: af7b39e595

Change-Id: I2932190abc5c3553271419461c91afc96881aa23

7 years agoFix improper connection check for absolute volume
Ajay Panicker [Tue, 11 Oct 2016 17:35:30 +0000 (17:35 +0000)]
Fix improper connection check for absolute volume
am: 446df0360e

Change-Id: I72486575e10b46f8efb19c833210ae63d60a8bbb

7 years agoReplace all uses of sprintf() with snprint()
George Burgess IV [Tue, 11 Oct 2016 17:35:20 +0000 (17:35 +0000)]
Replace all uses of sprintf() with snprint()
am: 80d7f60680

Change-Id: I6a988bb6bfe61aaab1e05318b21be545b48f7e0f

7 years agoMerge "Revert "Add dumpsys support for LE connection parameter updates""
Andre Eisenbach [Tue, 11 Oct 2016 17:35:10 +0000 (17:35 +0000)]
Merge "Revert "Add dumpsys support for LE connection parameter updates""
am: b2f7a959fd

Change-Id: Id532466a62d7100feedea66f7e09fec9e0c1ddba

7 years agoRemove Jabra headsets from absolute volume blacklist
Andre Eisenbach [Tue, 11 Oct 2016 17:35:00 +0000 (17:35 +0000)]
Remove Jabra headsets from absolute volume blacklist
am: 98c7415e95

Change-Id: Ib34049bc751e0d8b423d1a38ae4cf698bc97fd73

7 years agoConvert advertising HAL from struct into class (3/3)
Jakub Pawlowski [Tue, 11 Oct 2016 17:33:13 +0000 (17:33 +0000)]
Convert advertising HAL from struct into class (3/3)
am: 74ef54b440

Change-Id: I66f71a46d96d03de4dbe57fa3d38fd2cf2b6239f

7 years agoMerge "Remove return value of BTM_VendorSpecificCommand function"
Jakub Pawlowski [Tue, 11 Oct 2016 17:32:58 +0000 (17:32 +0000)]
Merge "Remove return value of BTM_VendorSpecificCommand function"
am: d4b958bced

Change-Id: I5d3b90dd514ea5c5170eaed4124ec4449db3ebe9

7 years agoManually merge commit 'cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix
Stephen Li [Tue, 11 Oct 2016 17:27:31 +0000 (10:27 -0700)]
Manually merge commit 'cc15f06acc3a1447318fefae00b3c10d9b7ae42a' to fix
automerger

BUG:32069275
Change-Id: I60cc50b21fe0d5a5464bd3acc5897ba7c4e05b73

7 years agostack: remove dead (#if 0'd) code
Marie Janssen [Mon, 10 Oct 2016 16:49:14 +0000 (09:49 -0700)]
stack: remove dead (#if 0'd) code

Test: compiles
Change-Id: I34f68c2b166a28622155358ff75478af8d18bed0

7 years agoFix improper connection check for absolute volume
Ajay Panicker [Tue, 11 Oct 2016 03:43:42 +0000 (20:43 -0700)]
Fix improper connection check for absolute volume

Test: Manually tested
Bug: 32060762
Change-Id: Ia6ca97c119d421aef1136f97afccb3f0c126334d

7 years agoReplace all uses of sprintf() with snprint()
George Burgess IV [Wed, 2 Mar 2016 22:00:19 +0000 (14:00 -0800)]
Replace all uses of sprintf() with snprint()

- sprintf() does not limit the length of the character string when writing
  to a buffer and may result in buffer overflow
- snprintf() requires the maximum write length as a parameter. When the
  maximum length supported is smaller than the reserved buffer length,
  the call will not result in buffer overflow

Bug: 31859081
Test: TestTracker/64195/3975
Change-Id: I519f8ef7b9b162fd79094f89148250d783c734c0

7 years agoMerge "Revert "Add dumpsys support for LE connection parameter updates""
Treehugger Robot [Mon, 10 Oct 2016 23:44:10 +0000 (23:44 +0000)]
Merge "Revert "Add dumpsys support for LE connection parameter updates""

7 years agoRemove Jabra headsets from absolute volume blacklist
Andre Eisenbach [Tue, 13 Sep 2016 16:57:51 +0000 (09:57 -0700)]
Remove Jabra headsets from absolute volume blacklist

Firmware fixes are available for affected headsets (Thanks, Jabra!!).

Change-Id: I60b42366d1e8155895cc58fff69f6404415a0406

7 years agoConvert advertising HAL from struct into class (3/3)
Jakub Pawlowski [Thu, 6 Oct 2016 23:52:30 +0000 (16:52 -0700)]
Convert advertising HAL from struct into class (3/3)

Bug: 30622771
Test: all related tests were updated
Change-Id: I9695284ae249fa427ae4b2f3e9649da951102c6c

7 years agoMerge "Remove return value of BTM_VendorSpecificCommand function"
Treehugger Robot [Mon, 10 Oct 2016 22:21:36 +0000 (22:21 +0000)]
Merge "Remove return value of BTM_VendorSpecificCommand function"

7 years agoRemove return value of BTM_VendorSpecificCommand function
Jakub Pawlowski [Mon, 10 Oct 2016 19:36:49 +0000 (12:36 -0700)]
Remove return value of BTM_VendorSpecificCommand function

The return value of BTM_VendorSpecificCommand is currently just an
information wether the callback was passed to it or not, but many places
through stack use this value as error indication. Remove it.

Test: unit tests pass
Change-Id: Idf73fc49fb25e52c3aeb64f2305b4498ecacd9a4

7 years agoRevert "Add dumpsys support for LE connection parameter updates"
Andre Eisenbach [Thu, 6 Oct 2016 22:42:22 +0000 (22:42 +0000)]
Revert "Add dumpsys support for LE connection parameter updates"

Reverting for now after talking to Jacky because this causes  circular dependencies as lower layer (stack/) functions are calling higher layer APIs (btif/) directly.

To restore a change like this, the data should be collected at a lower layer in the stack and reported through polling or a callback.

This reverts commit 8ec8ca4a875eed8b28e6714899f49781537411ae.

Change-Id: I748843864ae7198ea021fe70d2643a62097ab029

7 years agoMerge "L2CAP: Ensure handle is not null before attempting to close a socket"
Joseph Pirozzo [Mon, 10 Oct 2016 21:28:41 +0000 (21:28 +0000)]
Merge "L2CAP: Ensure handle is not null before attempting to close a socket"
am: 171c14eae0

Change-Id: I67fb6fa41c43625d428876bf5e54a8dae0356619

7 years agoRemove return value from btsnd_hcic_* functions
Jakub Pawlowski [Mon, 10 Oct 2016 21:27:36 +0000 (21:27 +0000)]
Remove return value from btsnd_hcic_* functions
am: 763abdfe79

Change-Id: I4248cbfafdc297d8053b12d26f1791d00dbf359e

7 years agoIgnore return value of btsnd_hcic_* functions
Jakub Pawlowski [Mon, 10 Oct 2016 21:27:34 +0000 (21:27 +0000)]
Ignore return value of btsnd_hcic_* functions
am: b6ab9b3af6

Change-Id: Id0f22cafe797ddd5934d5e0685a65123c6a4f089

7 years agoMerge "L2CAP: Ensure handle is not null before attempting to close a socket"
Treehugger Robot [Mon, 10 Oct 2016 20:19:29 +0000 (20:19 +0000)]
Merge "L2CAP: Ensure handle is not null before attempting to close a socket"

7 years agoRemove return value of BTM_VendorSpecificCommand function
Jakub Pawlowski [Mon, 10 Oct 2016 19:36:49 +0000 (12:36 -0700)]
Remove return value of BTM_VendorSpecificCommand function

The return value of BTM_VendorSpecificCommand is currently just an
information wether the callback was passed to it or not, but many places
through stack use this value as error indication. Remove it.

Test: unit tests pass
Change-Id: Idf73fc49fb25e52c3aeb64f2305b4498ecacd9a4

7 years agoRemove return value from btsnd_hcic_* functions
Jakub Pawlowski [Mon, 10 Oct 2016 18:39:39 +0000 (11:39 -0700)]
Remove return value from btsnd_hcic_* functions

btsnd_hcic_* functions are always returning true, so this return value
is not really useful.

Test: unit tests pass
Change-Id: I06ced65392d180ceed565e45b7831de6aede283c

7 years agoIgnore return value of btsnd_hcic_* functions
Jakub Pawlowski [Mon, 10 Oct 2016 16:35:13 +0000 (09:35 -0700)]
Ignore return value of btsnd_hcic_* functions

btsnd_hcic_* functions return only true. This patch makes sure that no
logic is waiting for "false" value.
Few methods, that had their return value dependent on result of
btsnd_hcic_* were made void.

Test: unit tests pass
Change-Id: I43cff62f461ff35f4bd84e5338f1a587b6a05c58

7 years agoL2CAP: Ensure handle is not null before attempting to close a socket
Joseph Pirozzo [Mon, 10 Oct 2016 14:05:51 +0000 (07:05 -0700)]
L2CAP: Ensure handle is not null before attempting to close a socket

Bug: 32054308
Test: manual, UPF 55
Change-Id: Ib89f7557fa390d60691afe8399a768e8127e52cb
(cherry picked from commit a1fa1bb0d638d5f444bf959fb839e824d69de31d)

7 years agoMerge "Add null check to avoid exception after L2CAP psm assigned"
Gurpreet Ghai [Fri, 7 Oct 2016 19:58:52 +0000 (19:58 +0000)]
Merge "Add null check to avoid exception after L2CAP psm assigned"
am: ee85d35220

Change-Id: Ie16d5d2af12291c02a47e6ce39fc002503063b93

7 years agoHID: Fix to handle UHID_OUTPUT_EV command from UHID driver
Ben YoungTae Kim [Fri, 7 Oct 2016 19:58:43 +0000 (19:58 +0000)]
HID: Fix to handle UHID_OUTPUT_EV command from UHID driver
am: 960b9c391d

Change-Id: I47e7a4edfdf075223b8eb3115a31ff0a5541aa7d

7 years agoMerge "Add null check to avoid exception after L2CAP psm assigned"
Treehugger Robot [Fri, 7 Oct 2016 19:51:54 +0000 (19:51 +0000)]
Merge "Add null check to avoid exception after L2CAP psm assigned"

7 years agoHID: Fix to handle UHID_OUTPUT_EV command from UHID driver
Ben YoungTae Kim [Wed, 10 Aug 2016 20:31:23 +0000 (13:31 -0700)]
HID: Fix to handle UHID_OUTPUT_EV command from UHID driver

Incorrect size check for UHID_OUTPUT_EV for incoming data from
UHID driver of kernel was leading to exiting of poll thread.
This was causing IOT issues with Apple Magic Mouse that require
output report to be sent for proper functioning of scroll functionality.

Bug: 28942565
Change-Id: I2eaba1f70b7cd51fb21933031d439543eb141fd2

7 years agoAdd null check to avoid exception after L2CAP psm assigned
Gurpreet Ghai [Wed, 3 Feb 2016 09:31:41 +0000 (15:01 +0530)]
Add null check to avoid exception after L2CAP psm assigned

Use case: BT will get crash in SNS testing.

steps: SNS testing BT ON/OFF.

Failure: Crash is observed.

Root Cause: If the number of supported services increased,
larger service record array is required. Smaller array is
resulting in out of record error causing L2CAP deregister.

Fix: Check added to avoid null pointer exception if null
is returned while fetching sock from id. Also cleanup of
SDP and security records done during BT turning Off.

Change-Id: I2e77127262119cabf2c372f894427dcdf3350e80

7 years agoRefactor advertising data types
Jakub Pawlowski [Thu, 6 Oct 2016 23:15:45 +0000 (23:15 +0000)]
Refactor advertising data types
am: 9eaf776867

Change-Id: I164b968032be28ea1ac5e1dceeb614d1b1945826

7 years agoRefactor advertising data types
Jakub Pawlowski [Wed, 5 Oct 2016 02:30:09 +0000 (19:30 -0700)]
Refactor advertising data types

Currently we have some unnecessary complicated code for handling
advertising data. Get rid of it.

Bug: 30622771
Test: Tests making sure flags and tx power are filled are added
Change-Id: I807cdf11577c357c116c54cab50bbf3261e1ee16

7 years agoUse the correct API to check whether a codec is valid
Pavlin Radoslavov [Wed, 5 Oct 2016 23:46:51 +0000 (23:46 +0000)]
Use the correct API to check whether a codec is valid
am: a0db321d98

Change-Id: I1ffc55d6a5d79aa62c191249a590a9bc2d0209bb

7 years agoUse the correct API to check whether a codec is valid
Pavlin Radoslavov [Wed, 5 Oct 2016 21:25:08 +0000 (14:25 -0700)]
Use the correct API to check whether a codec is valid

Use the (new) A2D_IsPeerSinkCodecValid() API call as appropriate
to check whether the codec information of a Sink peer is valid.
Previously, A2D_IsSourceCodecSupported() was used, and that didn't
match the original code (before the refactoring).
A2D_IsSourceCodecSupported() has extra checks, including min/max bitpool
oundaries, and those shouldn't be used for this initial check - the
bitpool boundaries can be adjusted later.

Similarly, use the new A2D_IsPeerSourceCodecValid() API call instead of
A2D_IsSinkCodecSupported().

Also:
 * Replaced A2D_IsValidCodec() with
   A2D_IsSourceCodecValid(), A2D_IsSinkCodecValid()
   A2D_IsPeerSourceCodecValid(), A2D_IsPeerSinkCodecValid()
   and added the appropriate unit tests.

 * Added extra debug messages to help identify similar issues in the future

Bug: 31749230
Test: manual test with a carkit, and unit tests
Change-Id: Iafaeb82744df9758e686194c91624992a0c55bdf

7 years agoRemove unnecessary checks of BTM_MAX_LOC_BD_NAME_LEN
Jakub Pawlowski [Wed, 5 Oct 2016 18:03:37 +0000 (18:03 +0000)]
Remove unnecessary checks of BTM_MAX_LOC_BD_NAME_LEN
am: be43ee7658

Change-Id: I1dbcfc9e49433b83426ee13df9bdbfda9a5deab9

7 years agoMake Bluetooth LE multi-advertising testable
Jakub Pawlowski [Wed, 5 Oct 2016 17:22:52 +0000 (17:22 +0000)]
Make Bluetooth LE multi-advertising testable
am: e47b769e71

Change-Id: I9dfc10c8849e1ac63494dbc9295d6e354127ec40

7 years agoRemove unnecessary checks of BTM_MAX_LOC_BD_NAME_LEN
Jakub Pawlowski [Tue, 4 Oct 2016 23:47:01 +0000 (16:47 -0700)]
Remove unnecessary checks of BTM_MAX_LOC_BD_NAME_LEN

Change-Id: I6e68f80d0d97081a4fc3879e6c11342923cfef7b

7 years agoMake Bluetooth LE multi-advertising testable
Jakub Pawlowski [Wed, 28 Sep 2016 14:36:54 +0000 (07:36 -0700)]
Make Bluetooth LE multi-advertising testable

This patch turns the code that manages LE multi-advertising into the
BleAdvertisingManager class. All HCI calls made by this code were
abstracted into BleAdvertiserHciInterface.

Thanks to those changes, we can mock BleAdvertiserHciInterface and test
the advertising manager.

The BleAdvertisingManagerTest, still has some dependencies on other
code from the "stack" module. These have to be implemented on top of the
test file. In the future, this dependencies should be replaced by mockable
classes.

Test: Tests covering the change are added in this patch.
Bug: 30622771
Change-Id: I4a363678815c235ee01255f462db2a671ef89610

7 years agovendor_lib: Apply clang-format with the new config
Myles Watson [Wed, 5 Oct 2016 04:03:33 +0000 (04:03 +0000)]
vendor_lib: Apply clang-format with the new config
am: 015834df15

Change-Id: I23daee752536e6758e9d06714d04edcaa68b9f9b

7 years agovendor_lib: Apply clang-format with the new config
Myles Watson [Fri, 30 Sep 2016 15:45:15 +0000 (08:45 -0700)]
vendor_lib: Apply clang-format with the new config

cd vendor_libs/test_vendor_lib/
clang-format ../linux/bt_vendor_linux.c -style=file -i
clang-format include/* test/* src/* -style=file -i

Update the style guide since clang-format help uses the
-style=file option.

Test: mm -j32
Change-Id: I166adfb2bb9a87fefa1242c91e5f180011caa2ad

7 years agobt: replace cutils/log.h with android/log.h
Mark Salyzyn [Tue, 4 Oct 2016 19:41:47 +0000 (19:41 +0000)]
bt: replace cutils/log.h with android/log.h
am: 5201f95102

Change-Id: Ieefd12664db41ec7e8a1c08088a3463a58a39d86

7 years agobt: replace cutils/log.h with android/log.h
Mark Salyzyn [Wed, 28 Sep 2016 22:31:49 +0000 (15:31 -0700)]
bt: replace cutils/log.h with android/log.h

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I8fb392150441ca5b6bc43dc43a10a3009e22202b

7 years agoMerge "Fix bad GATT client state machine state after successfull cache load"
Jakub Pawlowski [Tue, 4 Oct 2016 00:41:45 +0000 (00:41 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load"
am: 69b916046d

Change-Id: Ib8fedecce74779755c2ebb285db6ca31b8714b68

7 years agoMerge "Fix bad GATT client state machine state after successfull cache load"
Jakub Pawlowski [Tue, 4 Oct 2016 00:38:14 +0000 (00:38 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load"

7 years agoReplace log/log.h with android/log.h
Mark Salyzyn [Mon, 3 Oct 2016 22:48:20 +0000 (22:48 +0000)]
Replace log/log.h with android/log.h
am: 2f0c1fff33

Change-Id: I137539cc1f2cdeda6ceb6f7e4106fb379dc50555

7 years agoReplace log/log.h with android/log.h
Mark Salyzyn [Thu, 29 Sep 2016 16:16:01 +0000 (09:16 -0700)]
Replace log/log.h with android/log.h

Actually, remove reference, android logging is not used here.

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I37731dc37f61c129f3440e5d9ff1d0e71fe193d0

7 years agoFix bad GATT client state machine state after successfull cache load
Jakub Pawlowski [Mon, 3 Oct 2016 20:25:01 +0000 (13:25 -0700)]
Fix bad GATT client state machine state after successfull cache load

If the GATT service cache was successfully loaded from a file, the
state must be reset to idle.

Bug: 31175159
Change-Id: I92ebf1bec9d2e7467d7412b41923614ec5a13b6d

7 years agotest_vendor: Refactor scheduling of dual_mode_controller event handling
Jorge E. Moreira [Mon, 3 Oct 2016 17:28:07 +0000 (17:28 +0000)]
test_vendor: Refactor scheduling of dual_mode_controller event handling
am: 3c4f59fc27

Change-Id: Ia9a9860a9744580349921a5d9cb0ad9771bdefaf

7 years agotest_vendor: Refactor scheduling of dual_mode_controller event handling
Jorge E. Moreira [Fri, 16 Sep 2016 23:50:41 +0000 (16:50 -0700)]
test_vendor: Refactor scheduling of dual_mode_controller event handling

Moved all controller actions out of read callbacks to task callbacks to
avoid race conditions when modifying internal controller state.

Change-Id: Ie8bb762992755db2dddb6b7bb6a4fe52ab2d0020

7 years agoRemove redundant logic from system/bt/bta
Jack He [Fri, 30 Sep 2016 21:51:55 +0000 (21:51 +0000)]
Remove redundant logic from system/bt/bta
am: e143d941d2

Change-Id: I4fbe813cfa2809efd083cd36d567860fc7fe5ceb

7 years agoRemove redundant logic from system/bt/bta
Jack He [Fri, 30 Sep 2016 19:57:44 +0000 (12:57 -0700)]
Remove redundant logic from system/bt/bta

Bug: 31274290
Test: Manual
Change-Id: I5a4bff5e25b08a32709cdc81bac86a641d80f113

7 years agoMerge "Do not request remote name from non-connectable dev"
Kim Schulz [Fri, 30 Sep 2016 19:46:29 +0000 (19:46 +0000)]
Merge "Do not request remote name from non-connectable dev"
am: 49109aefb0

Change-Id: Iae4d72d5ed0c452085adf36b0c27daa61c45a8ae

7 years agoMerge "Do not request remote name from non-connectable dev"
Treehugger Robot [Fri, 30 Sep 2016 19:40:53 +0000 (19:40 +0000)]
Merge "Do not request remote name from non-connectable dev"

7 years agoMerge "Fix warnings of implicit function declaration in Linux vendor lib"
Patrick Tsai [Fri, 30 Sep 2016 19:40:06 +0000 (19:40 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib"
am: c4c9923724

Change-Id: I1d4d89be2d72f13e9bd5ae8b4b90856b21e3a0b9

7 years agoMerge "Fix warnings of implicit function declaration in Linux vendor lib"
Treehugger Robot [Fri, 30 Sep 2016 19:33:46 +0000 (19:33 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib"

7 years agoFix NULL pointer crash in send_at_cmd
Sebastien Griffoul [Fri, 30 Sep 2016 19:08:42 +0000 (19:08 +0000)]
Fix NULL pointer crash in send_at_cmd
am: 5c8fa2b199

Change-Id: I64b04cbf63438f25e58b700a9af6fe1d51a3905b

7 years agoDo not request remote name from non-connectable dev
Kim Schulz [Fri, 29 Apr 2016 08:26:02 +0000 (10:26 +0200)]
Do not request remote name from non-connectable dev

if an LE device is found during an LE scan, the BT host will try to fetch its name (creating an LE
connection) even though the advertising report received indicates that it is a non-connectable
advertising.
This is pointless and should not happen.

Change-Id: I246e4795b4f4e33f3202908ebff3724e8e89523c

7 years agoFix warnings of implicit function declaration in Linux vendor lib
Patrick Tsai [Sat, 19 Mar 2016 04:12:34 +0000 (21:12 -0700)]
Fix warnings of implicit function declaration in Linux vendor lib

Change-Id: I482f1096e87966f33ba8584ea60188abab3bcc42

7 years agoFix NULL pointer crash in send_at_cmd
Sebastien Griffoul [Fri, 17 Oct 2014 10:14:19 +0000 (12:14 +0200)]
Fix NULL pointer crash in send_at_cmd

If the string argument of send_at_cmd is a null pointer,
then the function should not crash: indeed this is a valid
parameters which can be used to send an AT cmd which doesn't
require any extra parameter.

Test: trivial fix. Existing unit tests still pass.
Change-Id: I3d83eebed660d703cd5a93a19dc73f4f354ab7bf
Signed-off-by: Sebastien Griffoul <sebastien.griffoul@intel.com>
7 years agoEnable libbase logging for whole stack
Jakub Pawlowski [Fri, 30 Sep 2016 00:22:21 +0000 (00:22 +0000)]
Enable libbase logging for whole stack
am: 75b83661ea

Change-Id: Ic09c0c3bfefbad2e8949f29b9d36c8fa13b266ae

7 years agoEnable libbase logging for whole stack
Jakub Pawlowski [Wed, 28 Sep 2016 01:24:59 +0000 (18:24 -0700)]
Enable libbase logging for whole stack

Currently, only C++ code in the service/ folder can use libbase logging.
This patch makes sure that logging can be used and is properly
configured for usage when the stack is running as part of Bluetooth.apk.

Bug: 31806042
Change-Id: I1f8be79ba9999b53ece0b5217a893b4bd20ecafc

7 years agoMerge "Support TARGET_TRANSLATE_2ND_ARCH case"
Victor Khimenko [Thu, 29 Sep 2016 06:13:07 +0000 (06:13 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case"
am: d09a76a935

Change-Id: Ib9c919256db089ed4ef859016d46ae8ec7791bdd

7 years agoMerge "Support TARGET_TRANSLATE_2ND_ARCH case"
Victor Khimenko [Thu, 29 Sep 2016 06:08:00 +0000 (06:08 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case"

7 years agoFix 100 LE device connection limitation
Andre Eisenbach [Thu, 29 Sep 2016 02:02:20 +0000 (02:02 +0000)]
Fix 100 LE device connection limitation
am: 426da5ad3c

Change-Id: Ie9d7439eda57bfaeac544bc35f6100413b1fe354

7 years agoFix 100 LE device connection limitation
Andre Eisenbach [Wed, 28 Sep 2016 01:07:58 +0000 (18:07 -0700)]
Fix 100 LE device connection limitation

Currently after 100 devices are added to the device security database,
any subsequent LE connection to a newly discovered LE device address
will fail as entries in the security record database are not reused.

This patch removes a device record if the device itself is removed and
also ensures that the oldest device security record is deleted if the
limit is reached to ensure a new record can be allocated.

Bug: 31625900
Test: SL4A multi-device connection test + regression
Change-Id: I22f6c82c64a9a9bfb2a16d79182903e5aa011355
(cherry picked from commit 013c32bf98b8d511dc29fcd7de7578a421a52590)

7 years agoSupport TARGET_TRANSLATE_2ND_ARCH case
Victor Khimenko [Wed, 28 Sep 2016 22:40:03 +0000 (00:40 +0200)]
Support TARGET_TRANSLATE_2ND_ARCH case

Build-only change to support the multilib case where the second arch
is translated (and thus bluetooth library is needed).

"True" multilib case is explicitly not supported.

Test: Build system refactoring CL. Existing unit tests still pass.

BUG=31422117

Change-Id: I09f239d39f5dbe0848a89367327db1ea1074ca39

7 years agoSeparate the definition of BTM layer types from control blocks
Jakub Pawlowski [Wed, 28 Sep 2016 21:24:01 +0000 (21:24 +0000)]
Separate the definition of BTM layer types from control blocks
am: dc3c1f2afa

Change-Id: Iea26880f80f623744cd96b40c27188428b7d9860

7 years agoSeparate the definition of BTM layer types from control blocks
Jakub Pawlowski [Wed, 28 Sep 2016 16:02:39 +0000 (09:02 -0700)]
Separate the definition of BTM layer types from control blocks

Right now, data types, control blocks, and functions used in the BTM
layer are defined in the same header files. This means that if someone
wants to write a test that uses those data types, they must also define
all control blocks, or compile the whole module.

This patch separates the data types from other definitions. Thanks to
it, we will be able to write unit tests, once other dependencies get
separated.

Change-Id: Ibc089e273cc37642fbb8672964b266c20f8d825d

7 years agoUse better callbacks in LE multi advertising
Jakub Pawlowski [Tue, 27 Sep 2016 18:42:32 +0000 (18:42 +0000)]
Use better callbacks in LE multi advertising
am: 0a009c382f

Change-Id: Ia9e39fe19443641b6d17cc8e78e8156b5304619f

7 years agoUse better callbacks in LE multi advertising
Jakub Pawlowski [Tue, 6 Sep 2016 14:42:36 +0000 (07:42 -0700)]
Use better callbacks in LE multi advertising

Right now, LE multi advertising related code uses it's own
implementation of queue on top of static array. Use std::queue, and
base::Callback instead.

Changing function pointers to base::Callback instances is required for
further refactoring, which will turn this code into class.

Bug: 30622771
Test: sl4a BleAdvertiseApiTest ConcurrentBleAdvertisingTest
Change-Id: I839e036c6edb4e19a17def4d68d351296468f88c

7 years agoUpdate BUILD.gn files
Jakub Pawlowski [Tue, 27 Sep 2016 15:33:33 +0000 (15:33 +0000)]
Update BUILD.gn files
am: 29796eb6de

Change-Id: I41391c0764e9def86ff32e72e65222e0c3f6043f

7 years agoUpdate BUILD.gn files
Jakub Pawlowski [Tue, 27 Sep 2016 15:21:55 +0000 (08:21 -0700)]
Update BUILD.gn files

7 years agoBluetooth: Prevent gatt DB copy if server cache is absent
Nitin Arora [Sat, 24 Sep 2016 00:31:06 +0000 (00:31 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent
am: c695f2578d

Change-Id: Ic25dfb446c5133823523e3b707177739d1296a9a

7 years agoBluetooth: Prevent gatt DB copy if server cache is absent
Nitin Arora [Thu, 14 Jul 2016 01:02:03 +0000 (18:02 -0700)]
Bluetooth: Prevent gatt DB copy if server cache is absent

In case the server cache does not exist for a specific
connection, the API used to copy the server DB into the
DB structure needs to return immediately. This change
makes sure of that and prevents dereferencing of a null
block causing the runtime error.

Change-Id: Iec3040a1280ef9d80b1b9c76eca8071dff499411

7 years agoMerge "Convert BLE multi-advertising code to C++"
Jakub Pawlowski [Fri, 23 Sep 2016 21:02:40 +0000 (21:02 +0000)]
Merge "Convert BLE multi-advertising code to C++"
am: 6cbb6f8c37

Change-Id: I917c9c38fafc5b8a4e537c89038e5bdd056e7c4c

7 years agoMerge "Convert BLE multi-advertising code to C++"
Jakub Pawlowski [Fri, 23 Sep 2016 20:53:24 +0000 (20:53 +0000)]
Merge "Convert BLE multi-advertising code to C++"

7 years agoMerge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
Ajay Panicker [Fri, 23 Sep 2016 19:13:32 +0000 (19:13 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
am: b64d604c0c

Change-Id: I87d5ef9224da76d569c2e4b32782f839686590df

7 years agoMerge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
Ajay Panicker [Fri, 23 Sep 2016 19:00:17 +0000 (19:00 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"

7 years agoConvert BLE multi-advertising code to C++
Jakub Pawlowski [Mon, 5 Sep 2016 11:31:34 +0000 (04:31 -0700)]
Convert BLE multi-advertising code to C++

This patch converts btm_ble_multi_adv.c file to .cc. It also separate
header definitions from rest of BTM layer. It is another step towards
making BLE advertising-related code testable.

Bug: 30622771
Change-Id: I89965e10fbf773e48176ee19ef613dd0df2fb951

7 years agoRemoved usage of A2DP codec_type as a separate field
Pavlin Radoslavov [Thu, 22 Sep 2016 23:25:37 +0000 (23:25 +0000)]
Removed usage of A2DP codec_type as a separate field
am: b3e5af36e9

Change-Id: I886c6b3cbaa9cd1abdfc8340e586f5cd2dc33cc2

7 years agoFix the BLE connection failure with some mice
chaoyu.x.wu [Thu, 22 Sep 2016 21:58:35 +0000 (21:58 +0000)]
Fix the BLE connection failure with some mice
am: 1ec17e06c7

Change-Id: Ib5b03ac545fee9c71ae53d869615a1f0fc155182

7 years agoRemoved usage of A2DP codec_type as a separate field
Pavlin Radoslavov [Tue, 20 Sep 2016 21:10:08 +0000 (14:10 -0700)]
Removed usage of A2DP codec_type as a separate field

The value of codec_type can be extracted from the codec_info,
so it is not needed to pass it around as an argument, or keep
it as an field.

Also:
* Added new APIs and the corresponding unit tests:
  - A2D_GetPacketTimestamp()
  - A2D_BuildCodecHeader() - replacement for bta_av_sbc_bld_hdr()
  - A2D_CodecName()
* Replaced tBTA_AV_SEP.codec_type with tBTA_AV_SEP.codec_info

Bug: 30958229
Test: A2DP tested manually. Unit tests included in the CL.
Change-Id: I3bfd4750e8639d77a9938ab3c274c9d6ea859fb6

7 years agoMove btsnoop_hci.log to /data/misc/bluetooth/logs
Ajay Panicker [Wed, 14 Sep 2016 18:46:23 +0000 (11:46 -0700)]
Move btsnoop_hci.log to /data/misc/bluetooth/logs

Bug: 31466840
Change-Id: Ibd8f8b85eb59be8bfbb8a7c83b5935802624a748

7 years agoFix the BLE connection failure with some mice
chaoyu.x.wu [Mon, 11 Apr 2016 06:08:48 +0000 (14:08 +0800)]
Fix the BLE connection failure with some mice

If enable the "connection parameters update" during GATT discovery,
it may cause some device connection failure due to connection timeout.
Since the the "connection parameter update" is enabled again when GATT
discovery completed, remove the enable of "connection parameter update"
after SMP complete to fix the issue.

This issue was already fixed in commit 2d41fe1c, but then it was
re-introduced in commit 444a8da8, which also removed comment explaining
the issue, added back in this patch.

Bug: 29060797
Change-Id: I42b0b36056821c30d887484e22bfcbd04ea7ca03

7 years agoMerge "Fix improper null check when handling rc features"
Ajay Panicker [Thu, 22 Sep 2016 08:21:11 +0000 (08:21 +0000)]
Merge "Fix improper null check when handling rc features"
am: e90972c9f2

Change-Id: I228b1a0befa5becf1c60ca5eaa4b8b1a1e2292f8

7 years agoMerge "Remove net_bt_stack group and replace it with bluetooth"
Ajay Panicker [Thu, 22 Sep 2016 08:09:28 +0000 (08:09 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
am: b85d405374

Change-Id: Iea39edaa3c6294001384597a151906aacf423980

7 years agoMerge "Fix improper null check when handling rc features"
Treehugger Robot [Thu, 22 Sep 2016 01:49:03 +0000 (01:49 +0000)]
Merge "Fix improper null check when handling rc features"

7 years agoMerge "Remove net_bt_stack group and replace it with bluetooth"
Ajay Panicker [Thu, 22 Sep 2016 01:32:33 +0000 (01:32 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"

7 years agoFix improper null check when handling rc features
Ajay Panicker [Wed, 21 Sep 2016 23:35:00 +0000 (16:35 -0700)]
Fix improper null check when handling rc features

Bug: 31533166
Change-Id: Ia04e9c51280a3e379c0670b39a84eb5a53c5332b