OSDN Git Service

android-x86/system-bt.git
7 years agoRemove Jabra headsets from absolute volume blacklist am: 98c7415e95 am: ecc90d0f7b
Andre Eisenbach [Tue, 11 Oct 2016 17:47:11 +0000 (17:47 +0000)]
Remove Jabra headsets from absolute volume blacklist am: 98c7415e95 am: ecc90d0f7b
am: 1c25f2abd6

Change-Id: Ib21cd8d3297010ecee959d7a43d0033d576019a1

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

Change-Id: Ib090a816dcc7c65dbfeafc746b7cee95f5ce787b

7 years agoMerge "Remove return value of BTM_VendorSpecificCommand function" am: d4b958bced...
Jakub Pawlowski [Tue, 11 Oct 2016 17:45:52 +0000 (17:45 +0000)]
Merge "Remove return value of BTM_VendorSpecificCommand function" am: d4b958bced am: 459373a3d0
am: 9d6cf09525

Change-Id: Ic090db35b4174ebc2cc8b6dcb62b6afbbcb7cab3

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

Change-Id: I4d432404d0e2e3d9b1dcf9bb02bd917e4a51837f

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

Change-Id: I420874bb6bc76741324f73e8b31c40418c8b36ee

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

Change-Id: Ia5118dcea23fa15a5f907b9653ad2ff41a4e52ec

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 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 agoMerge "L2CAP: Ensure handle is not null before attempting to close a socket" am:...
Joseph Pirozzo [Mon, 10 Oct 2016 22:44:42 +0000 (22:44 +0000)]
Merge "L2CAP: Ensure handle is not null before attempting to close a socket" am: 171c14eae0 am: eee39a51e6
am: d9bd1d15c2

Change-Id: Ib82bd66671d064876c6e99623fe6f9b53dbe90c8

7 years agoRemove return value from btsnd_hcic_* functions am: 763abdfe79 am: 83eb6b9d71
Jakub Pawlowski [Mon, 10 Oct 2016 22:44:22 +0000 (22:44 +0000)]
Remove return value from btsnd_hcic_* functions am: 763abdfe79 am: 83eb6b9d71
am: c846a8448d

Change-Id: I67241af4df6314ca80b0d86cc3751405ee092c2d

7 years agoIgnore return value of btsnd_hcic_* functions am: b6ab9b3af6 am: bf1ff14834
Jakub Pawlowski [Mon, 10 Oct 2016 22:44:16 +0000 (22:44 +0000)]
Ignore return value of btsnd_hcic_* functions am: b6ab9b3af6 am: bf1ff14834
am: 4e0e0fe522

Change-Id: I01c91b569afeb4dc0504f28b9420cf3bc848ef3f

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

Change-Id: I208840b1bf2927ce0b14ef853ae801447e377926

7 years agoRemove return value from btsnd_hcic_* functions am: 763abdfe79
Jakub Pawlowski [Mon, 10 Oct 2016 22:28:02 +0000 (22:28 +0000)]
Remove return value from btsnd_hcic_* functions am: 763abdfe79
am: 83eb6b9d71

Change-Id: I43c09615eccb67a8c079a5b1ac25325acc254b5a

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

Change-Id: I1c4ccf0bc72c73be53018882c716a325e908812b

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 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" am: ee85d35220...
Gurpreet Ghai [Fri, 7 Oct 2016 20:07:23 +0000 (20:07 +0000)]
Merge "Add null check to avoid exception after L2CAP psm assigned" am: ee85d35220 am: defed78c2a
am: cdd852f7c1

Change-Id: Id2a3d73a939f51b4e618768ef744ad94f17e496f

7 years agoHID: Fix to handle UHID_OUTPUT_EV command from UHID driver am: 960b9c391d am: 9dfee34e3f
Ben YoungTae Kim [Fri, 7 Oct 2016 20:07:14 +0000 (20:07 +0000)]
HID: Fix to handle UHID_OUTPUT_EV command from UHID driver am: 960b9c391d am: 9dfee34e3f
am: 1fa91ea4a9

Change-Id: Iaf8eb1724a01e5209caac6d16dad8f0e1888579d

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

Change-Id: I6602872885f941baf842aba7de05ff602c33e7ba

7 years agoHID: Fix to handle UHID_OUTPUT_EV command from UHID driver am: 960b9c391d
Ben YoungTae Kim [Fri, 7 Oct 2016 20:02:39 +0000 (20:02 +0000)]
HID: Fix to handle UHID_OUTPUT_EV command from UHID driver am: 960b9c391d
am: 9dfee34e3f

Change-Id: Ibd3acdfdf31b7fb31dc07288f4d8bd46895c4cba

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 am: 9eaf776867 am: 8b081eb046
Jakub Pawlowski [Thu, 6 Oct 2016 23:22:45 +0000 (23:22 +0000)]
Refactor advertising data types am: 9eaf776867 am: 8b081eb046
am: 86d0de756f

Change-Id: I2a01a5e54b5b160c7f6b9496697b3c5af4dbc214

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

Change-Id: Ib537646a851d0035a98d2ee313e2c41eded4054c

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 am: a0db321d98 am: 70340b2e5a
Pavlin Radoslavov [Wed, 5 Oct 2016 23:52:23 +0000 (23:52 +0000)]
Use the correct API to check whether a codec is valid am: a0db321d98 am: 70340b2e5a
am: 6e72f242e2

Change-Id: I63484758582a02f2e6d7ed9caa7c72dd1f0c3841

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

Change-Id: I11d33eb780421159ea075d2258cf6f3bd54cf305

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 am: be43ee7658 am: 4ca45cee60
Jakub Pawlowski [Wed, 5 Oct 2016 18:08:39 +0000 (18:08 +0000)]
Remove unnecessary checks of BTM_MAX_LOC_BD_NAME_LEN am: be43ee7658 am: 4ca45cee60
am: 3b2ff2d034

Change-Id: Icff06a450095b10248b12da243295e62ff4bc2e9

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

Change-Id: Ie93d9f49eb2c96cdecb89ab7b92b49b74a154e65

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 am: e47b769e71 am: 7e6427804e
Jakub Pawlowski [Wed, 5 Oct 2016 17:28:21 +0000 (17:28 +0000)]
Make Bluetooth LE multi-advertising testable am: e47b769e71 am: 7e6427804e
am: 1e9a53e21b

Change-Id: I437cf678e93b02e79010942f83b85859cec159cb

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

Change-Id: I6815329400aca2471360f76eafb7a13357906e2b

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 am: 015834df15 am: d4c8851090
Myles Watson [Wed, 5 Oct 2016 04:08:03 +0000 (04:08 +0000)]
vendor_lib: Apply clang-format with the new config am: 015834df15 am: d4c8851090
am: e3275cace0

Change-Id: I5c974f817d7735aa5c8e17476b5944723c50b2c1

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

Change-Id: I946747b17cd5cc06a4c4fe5736f18c6a7c824c93

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 am: 5201f95102 am: be4bc71f9f
Mark Salyzyn [Tue, 4 Oct 2016 19:49:35 +0000 (19:49 +0000)]
bt: replace cutils/log.h with android/log.h am: 5201f95102 am: be4bc71f9f
am: 7dca880ac4

Change-Id: If9054ad03a039ee918e5864d9f613ea95b0ac67d

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

Change-Id: Ifa91e4b14d98dc4dd22faf27b4b5d8dd4df1b2da

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 agoFix bad GATT client state machine state after successfull cache load am: f87953f1be
Jakub Pawlowski [Tue, 4 Oct 2016 16:47:09 +0000 (16:47 +0000)]
Fix bad GATT client state machine state after successfull cache load am: f87953f1be
am: 565ca33e21

Change-Id: I40d4f4d32ca87341f82fecb721f394e7caa0aa50

7 years agoFix bad GATT client state machine state after successfull cache load
Jakub Pawlowski [Tue, 4 Oct 2016 16:45:43 +0000 (16:45 +0000)]
Fix bad GATT client state machine state after successfull cache load
am: f87953f1be

Change-Id: If89361b40bd9abf0150afa4ac2af1b02366eafc7

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" am:...
Jakub Pawlowski [Tue, 4 Oct 2016 00:49:39 +0000 (00:49 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load" am: 69b916046d am: 0776cdf3e6
am: 42acb81619

Change-Id: Ia726080e38eb634668665b07e9bd4ea91b6ae340

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

Change-Id: I2094e041dc9d38c1ceb1ea5a649d62de16a9ae0a

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 am: 2f0c1fff33 am: 53dc5ba848
Mark Salyzyn [Mon, 3 Oct 2016 22:57:31 +0000 (22:57 +0000)]
Replace log/log.h with android/log.h am: 2f0c1fff33 am: 53dc5ba848
am: 7a3ec37304

Change-Id: I49cd4f5249dc65c74cf828254f3191a017eb3ad2

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

Change-Id: I1009dd3e5413e8c84608bc6e473cd4127fbd4f9e

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 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 am: 3c4f59fc2...
Jorge E. Moreira [Mon, 3 Oct 2016 17:37:49 +0000 (17:37 +0000)]
test_vendor: Refactor scheduling of dual_mode_controller event handling am: 3c4f59fc27 am: 81f2249e94
am: f8626b0721

Change-Id: I8bf88152127337435a7fa5330be45c610f30f65b

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

Change-Id: I9e6660f68a78f200d00ccc8f895b59599901138a

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 am: e143d941d2 am: b9554aed8a
Jack He [Fri, 30 Sep 2016 22:02:55 +0000 (22:02 +0000)]
Remove redundant logic from system/bt/bta am: e143d941d2 am: b9554aed8a
am: 1a8056a222

Change-Id: I278f26b30e5e05391fb7920f57fe1d6149f9c7be

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

Change-Id: Id26fd245bb90aeeee658a61adee595d30ef0ba15

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" am: 49109aefb0 am: 13e05a1959
Kim Schulz [Fri, 30 Sep 2016 19:53:05 +0000 (19:53 +0000)]
Merge "Do not request remote name from non-connectable dev" am: 49109aefb0 am: 13e05a1959
am: 3ab83c181e

Change-Id: I206199b593ad932e6603ffe4e34322cdfb3295f7

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

Change-Id: Id6c15d6012a7a2d6edfbee1e24ef81fba25e93ac

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

Change-Id: Ie041880ef40b5a0f5a873caa0332ba5b4da20aec

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 "Fix warnings of implicit function declaration in Linux vendor lib" am: c4c9923724
Patrick Tsai [Fri, 30 Sep 2016 19:43:08 +0000 (19:43 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib" am: c4c9923724
am: feaf001c2d

Change-Id: I18d5825d09aba13e37ece6e8b63b5087bd729d08

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 am: 5c8fa2b199 am: 907d1e9cdc
Sebastien Griffoul [Fri, 30 Sep 2016 19:14:53 +0000 (19:14 +0000)]
Fix NULL pointer crash in send_at_cmd am: 5c8fa2b199 am: 907d1e9cdc
am: 0df96a52b2

Change-Id: I575c15a4cc39000c494cb69ef1647d3161032a74

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

Change-Id: Iccd3eb172e6bdae93aab0dbf7724d5a73beba379

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 am: 75b83661ea am: 8d81059e2f
Jakub Pawlowski [Fri, 30 Sep 2016 00:25:53 +0000 (00:25 +0000)]
Enable libbase logging for whole stack am: 75b83661ea am: 8d81059e2f
am: 1f161a621d

Change-Id: If12246cb7f0a7ecc7814d8b70e543c6a2b1d883b

7 years agoEnable libbase logging for whole stack am: 75b83661ea
Jakub Pawlowski [Fri, 30 Sep 2016 00:24:21 +0000 (00:24 +0000)]
Enable libbase logging for whole stack am: 75b83661ea
am: 8d81059e2f

Change-Id: I7d89ff65ad5de2d0756cab4ffdb6cf77cf34b9ac

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" am: d09a76a935 am: b874d655ef
Victor Khimenko [Thu, 29 Sep 2016 06:26:54 +0000 (06:26 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case" am: d09a76a935 am: b874d655ef
am: f0105e5a76

Change-Id: I7486a2559590d1f9d3840ddaeb5f0ea62f643c4d

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

Change-Id: I9d091454c236d3f5bd6c3f96725869f2c563bbb0

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